openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pinctrl: aspeed: Rework strap register write logic for the AST2500 

Yong Li found that writes to the AST2500 strapping register were not
properly supported by the Aspeed pinctrl core and provided a patch to
rectify the problem. Several revisions of the patch were posted and
ultimately v4 should have been applied, however some unfortunate
liberal application of tags on my part lead to confusion between v3[1]
and v4[2].

Generate the diff between v3 and v4 to apply as a fixup patch.

[1] http://patchwork.ozlabs.org/patch/801662/
[2] http://patchwork.ozlabs.org/patch/802946/

Cc: Yong Li <sdliyong@gmail.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andrew Jeffery 2017-08-23 23:11:25 +09:30 committed by Linus Walleij
parent faaaba0652
commit 5241bd16c7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pinctrl/aspeed/pinctrl-aspeed.c
View File

@ -183,7 +183,6 @@ static int aspeed_sig_expr_set(const struct aspeed_sig_expr *expr,
{ {
int ret; int ret;
int i; int i;
unsigned int rev_id;
for (i = 0; i < expr->ndescs; i++) { for (i = 0; i < expr->ndescs; i++) {
const struct aspeed_sig_desc *desc = &expr->descs[i]; const struct aspeed_sig_desc *desc = &expr->descs[i];
@ -216,18 +215,25 @@ static int aspeed_sig_expr_set(const struct aspeed_sig_expr *expr,
/* On AST2500, Set bits in SCU7C are cleared from SCU70 */ /* On AST2500, Set bits in SCU7C are cleared from SCU70 */
if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP1) { if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP1) {
unsigned int rev_id;
ret = regmap_read(maps[ASPEED_IP_SCU], ret = regmap_read(maps[ASPEED_IP_SCU],
HW_REVISION_ID, &rev_id); HW_REVISION_ID, &rev_id);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (0x04 == ((rev_id >> 24) & 0xff)) if (0x04 == (rev_id >> 24)) {
u32 value = ~val & desc->mask;
if (value) {
ret = regmap_write(maps[desc->ip], ret = regmap_write(maps[desc->ip],
HW_REVISION_ID, (~val & desc->mask)); HW_REVISION_ID, value);
else if (ret < 0)
ret = regmap_update_bits(maps[desc->ip], return ret;
desc->reg, desc->mask, val); }
} else }
}
ret = regmap_update_bits(maps[desc->ip], desc->reg, ret = regmap_update_bits(maps[desc->ip], desc->reg,
desc->mask, val); desc->mask, val);