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

[Andrew Jeffery]

Hi Yong,

On Fri, 2017-08-11 at 15:27 +0800, Yong Li wrote:
> 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@xxxxxxxxx>
> ---
> Â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);

Good catch! However, this looks like it's only true on the AST2500 (and
related) SoCs. The AST2400 will clear the bits on writing 0 to
HW_STRAP1, so you will need some strategy to differentiate the two.
You're adding the HW_REVISION_ID offset, so maybe we could read that
back and write HW_REVISION_ID if the top byte is 0x04. This would save
some pain propagating the compatible through to here.

For reference, HW_REVISION_ID is structured as:

31:24: Reserved - SoC generation
	AST11xx: 0x00
	AST20xx: 0x00
	AST21xx: 0x00
	AST22xx: 0x00
	AST23xx: 0x01
	AST13xx: 0x01
	AST10xx: 0x01
	AST24xx: 0x02
	AST14xx: 0x02
	AST12xx: 0x02
	AST25xx: 0x04

23:16: Hardware revision
	A0: 0x00
	A1: 0x01
	A2: 0x03

15:8: Chip bonding option

7:0: Reserved

Cheers,

Andrew

> Â
> > Â		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 */

Attachment: signature.asc
Description: This is a digitally signed message part