| Message ID | 20191226023734.9631-1-qianggui.song@amlogic.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 35c60be220572de7d6605c4318f640d133982040 |
| Headers | show |
| Series | pinctrl: meson: Fix wrong shift value when get drive-strength | expand |
On Thu, Dec 26, 2019 at 3:37 AM Qianggui Song <qianggui.song@amlogic.com> wrote: > In meson_pinconf_get_drive_strength, variable bit is calculated by > meson_calc_reg_and_bit, this value is the offset from the first pin of a > certain bank to current pin, while Meson SoCs use two bits for each pin > to depict drive-strength. So a left shift by 1 should be done or node > pinconf-pins shows wrong message. > > Fixes: 6ea3e3bbef37 ("pinctrl: meson: add support of drive-strength-microamp") > > Signed-off-by: Qianggui Song <qianggui.song@amlogic.com> Patch applied. Yours, Linus Walleij
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 3c80828a5e50..bbc919bef2bf 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -441,6 +441,7 @@ static int meson_pinconf_get_drive_strength(struct meson_pinctrl *pc, return ret; meson_calc_reg_and_bit(bank, pin, REG_DS, ®, &bit); + bit = bit << 1; ret = regmap_read(pc->reg_ds, reg, &val); if (ret)
In meson_pinconf_get_drive_strength, variable bit is calculated by meson_calc_reg_and_bit, this value is the offset from the first pin of a certain bank to current pin, while Meson SoCs use two bits for each pin to depict drive-strength. So a left shift by 1 should be done or node pinconf-pins shows wrong message. Fixes: 6ea3e3bbef37 ("pinctrl: meson: add support of drive-strength-microamp") Signed-off-by: Qianggui Song <qianggui.song@amlogic.com> --- drivers/pinctrl/meson/pinctrl-meson.c | 1 + 1 file changed, 1 insertion(+)