pinctrl: sunxi: fix pin numbers passed to register offset helpers

The pin numbers passed to sunxi_*_reg helpers to get the correct
registers should be the pin offset for the PIO block, not the
absolute number we use that is based on the alphanumeric labels
Allwinner uses.

This patch subtracts .pin_base from the pin number passed to these
functions, so the driver accesses the correct registers.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 6dfc172af9d317ab8f9902e35599fc083dd01603..42963480848d5c70b8917dbc779b37565104dff8 100644 (file)
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -280,6 +280,7 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,
        struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
        struct sunxi_pinctrl_group *g = &pctl->groups[group];
        unsigned long flags;
+       unsigned pin = g->pin - pctl->desc->pin_base;
        u32 val, mask;
        u16 strength;
        u8 dlevel;
@@ -303,23 +304,23 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,
                         *   3: 40mA
                         */
                        dlevel = strength / 10 - 1;
-                       val = readl(pctl->membase + sunxi_dlevel_reg(g->pin));
-                       mask = DLEVEL_PINS_MASK << sunxi_dlevel_offset(g->pin);
+                       val = readl(pctl->membase + sunxi_dlevel_reg(pin));
+                       mask = DLEVEL_PINS_MASK << sunxi_dlevel_offset(pin);
                        writel((val & ~mask)
-                               | dlevel << sunxi_dlevel_offset(g->pin),
-                               pctl->membase + sunxi_dlevel_reg(g->pin));
+                               | dlevel << sunxi_dlevel_offset(pin),
+                               pctl->membase + sunxi_dlevel_reg(pin));
                        break;
                case PIN_CONFIG_BIAS_PULL_UP:
-                       val = readl(pctl->membase + sunxi_pull_reg(g->pin));
-                       mask = PULL_PINS_MASK << sunxi_pull_offset(g->pin);
-                       writel((val & ~mask) | 1 << sunxi_pull_offset(g->pin),
-                               pctl->membase + sunxi_pull_reg(g->pin));
+                       val = readl(pctl->membase + sunxi_pull_reg(pin));
+                       mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
+                       writel((val & ~mask) | 1 << sunxi_pull_offset(pin),
+                               pctl->membase + sunxi_pull_reg(pin));
                        break;
                case PIN_CONFIG_BIAS_PULL_DOWN:
-                       val = readl(pctl->membase + sunxi_pull_reg(g->pin));
-                       mask = PULL_PINS_MASK << sunxi_pull_offset(g->pin);
-                       writel((val & ~mask) | 2 << sunxi_pull_offset(g->pin),
-                               pctl->membase + sunxi_pull_reg(g->pin));
+                       val = readl(pctl->membase + sunxi_pull_reg(pin));
+                       mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
+                       writel((val & ~mask) | 2 << sunxi_pull_offset(pin),
+                               pctl->membase + sunxi_pull_reg(pin));
                        break;
                default:
                        break;
@@ -376,6 +377,7 @@ static void sunxi_pmx_set(struct pinctrl_dev *pctldev,
 
        spin_lock_irqsave(&pctl->lock, flags);
 
+       pin -= pctl->desc->pin_base;
        val = readl(pctl->membase + sunxi_mux_reg(pin));
        mask = MUX_PINS_MASK << sunxi_mux_offset(pin);
        writel((val & ~mask) | config << sunxi_mux_offset(pin),