[PATCH] pinctrl: aspeed: Fix hardware strap register write logic

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Yong Li <sdliyong@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] pinctrl: aspeed: Fix hardware strap register write logic
Date	Fri, 11 Aug 2017 09:30:01 +0200
Message-ID	<udcyl-A7-9@gated-at.bofh.it> (permalink)
X-Extloop1	1
X-Ironport-Av	E=Sophos;i="5.41,356,1498546800"; d="scan'208";a="888910833"
X-Mailer	git-send-email 2.7.4
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Content-Transfer-Encoding	8bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	sdliyong@gmail.com
X-Original-Date	Fri, 11 Aug 2017 15:27:52 +0800
X-Original-Message-ID	<1502436472-136063-1-git-send-email-sdliyong@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1709333

Show key headers only | View raw

The hardware strap register(SCU70) only accepts write ‘1’,
to clear it to ‘0’, must set bits(write  ‘1’) to SCU7C

Signed-off-by: Yong Li <sdliyong@gmail.com>
---
 drivers/pinctrl/aspeed/pinctrl-aspeed.c | 9 +++++++--
 drivers/pinctrl/aspeed/pinctrl-aspeed.h | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
index a86a4d6..4305052 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
@@ -213,8 +213,13 @@ static int aspeed_sig_expr_set(const struct aspeed_sig_expr *expr,
 		if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP2)
 			continue;
 
-		ret = regmap_update_bits(maps[desc->ip], desc->reg,
-					 desc->mask, val);
+		if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP1 &&
+			val == 0)
+			ret = regmap_update_bits(maps[desc->ip], HW_REVISION_ID,
+				desc->mask, desc->mask);
+		else
+			ret = regmap_update_bits(maps[desc->ip], desc->reg,
+				desc->mask, val);
 
 		if (ret)
 			return ret;
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h
index fa125db..d4d7f03 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h
@@ -251,6 +251,7 @@
 #define SCU3C           0x3C /* System Reset Control/Status Register */
 #define SCU48           0x48 /* MAC Interface Clock Delay Setting */
 #define HW_STRAP1       0x70 /* AST2400 strapping is 33 bits, is split */
+#define HW_REVISION_ID  0x7C /* Silicon revision ID register */
 #define SCU80           0x80 /* Multi-function Pin Control #1 */
 #define SCU84           0x84 /* Multi-function Pin Control #2 */
 #define SCU88           0x88 /* Multi-function Pin Control #3 */
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] pinctrl: aspeed: Fix hardware strap register write logic Yong Li <sdliyong@gmail.com> - 2017-08-11 09:30 +0200
  Re: [PATCH] pinctrl: aspeed: Fix hardware strap register write logic Andrew Jeffery <andrew@aj.id.au> - 2017-08-11 10:50 +0200

csiph-web