diff options
| author | Yong Li | 2017-08-15 18:21:50 +0200 |
|---|---|---|
| committer | Linus Walleij | 2017-08-22 14:51:44 +0200 |
| commit | 1865af212dfa0819ca21c7e5c18c2a75202c1827 (patch) | |
| tree | a41e9818e74cab4f7cda796ef66ad48b75d3d3d9 /drivers/pinctrl/aspeed/pinctrl-aspeed.c | |
| parent | pinctrl: sunxi: fix wrong irq_banks number for H5 pinctrl (diff) | |
| download | kernel-qcow2-linux-1865af212dfa0819ca21c7e5c18c2a75202c1827.tar.gz kernel-qcow2-linux-1865af212dfa0819ca21c7e5c18c2a75202c1827.tar.xz kernel-qcow2-linux-1865af212dfa0819ca21c7e5c18c2a75202c1827.zip | |
pinctrl: aspeed: Fix ast2500 strap register write logic
On AST2500, 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>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Tested-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/aspeed/pinctrl-aspeed.c')
| -rw-r--r-- | drivers/pinctrl/aspeed/pinctrl-aspeed.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c index a86a4d66099c..f2d5133f6993 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c @@ -183,6 +183,7 @@ static int aspeed_sig_expr_set(const struct aspeed_sig_expr *expr, { int ret; int i; + unsigned int rev_id; for (i = 0; i < expr->ndescs; i++) { const struct aspeed_sig_desc *desc = &expr->descs[i]; @@ -213,8 +214,22 @@ 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); + /* On AST2500, Set bits in SCU7C are cleared from SCU70 */ + if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP1) { + ret = regmap_read(maps[ASPEED_IP_SCU], + HW_REVISION_ID, &rev_id); + if (ret < 0) + return ret; + + if (0x04 == ((rev_id >> 24) & 0xff)) + ret = regmap_write(maps[desc->ip], + HW_REVISION_ID, (~val & desc->mask)); + else + ret = regmap_update_bits(maps[desc->ip], + desc->reg, desc->mask, val); + } else + ret = regmap_update_bits(maps[desc->ip], desc->reg, + desc->mask, val); if (ret) return ret; |