pinctrl: imx: add gpio pinmux support for vf610
authorStefan Agner <stefan@agner.ch>
Thu, 16 Oct 2014 19:47:57 +0000 (21:47 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 28 Oct 2014 15:59:30 +0000 (16:59 +0100)
Add pinmux support for GPIO for Vybrid (vf610) IOMUX controller.
This is needed since direction configuration is not part of the
GPIO module in Vybrid.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/freescale/pinctrl-imx.c

index f2446769247f50b59bf10e391a8acaf45b77ce6c..52f2b9404fe058354a4c056fd7f2159bcea9de32 100644 (file)
@@ -294,11 +294,83 @@ static int imx_pmx_get_groups(struct pinctrl_dev *pctldev, unsigned selector,
        return 0;
 }
 
+static int imx_pmx_gpio_request_enable(struct pinctrl_dev *pctldev,
+                       struct pinctrl_gpio_range *range, unsigned offset)
+{
+       struct imx_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
+       const struct imx_pinctrl_soc_info *info = ipctl->info;
+       const struct imx_pin_reg *pin_reg;
+       struct imx_pin_group *grp;
+       struct imx_pin *imx_pin;
+       unsigned int pin, group;
+       u32 reg;
+
+       /* Currently implementation only for shared mux/conf register */
+       if (!(info->flags & SHARE_MUX_CONF_REG))
+               return -EINVAL;
+
+       pin_reg = &info->pin_regs[offset];
+       if (pin_reg->mux_reg == -1)
+               return -EINVAL;
+
+       /* Find the pinctrl config with GPIO mux mode for the requested pin */
+       for (group = 0; group < info->ngroups; group++) {
+               grp = &info->groups[group];
+               for (pin = 0; pin < grp->npins; pin++) {
+                       imx_pin = &grp->pins[pin];
+                       if (imx_pin->pin == offset && !imx_pin->mux_mode)
+                               goto mux_pin;
+               }
+       }
+
+       return -EINVAL;
+
+mux_pin:
+       reg = readl(ipctl->base + pin_reg->mux_reg);
+       reg &= ~(0x7 << 20);
+       reg |= imx_pin->config;
+       writel(reg, ipctl->base + pin_reg->mux_reg);
+
+       return 0;
+}
+
+static int imx_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
+          struct pinctrl_gpio_range *range, unsigned offset, bool input)
+{
+       struct imx_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
+       const struct imx_pinctrl_soc_info *info = ipctl->info;
+       const struct imx_pin_reg *pin_reg;
+       u32 reg;
+
+       /*
+        * Only Vybrid has the input/output buffer enable flags (IBE/OBE)
+        * They are part of the shared mux/conf register.
+        */
+       if (!(info->flags & SHARE_MUX_CONF_REG))
+               return -EINVAL;
+
+       pin_reg = &info->pin_regs[offset];
+       if (pin_reg->mux_reg == -1)
+               return -EINVAL;
+
+       /* IBE always enabled allows us to read the value "on the wire" */
+       reg = readl(ipctl->base + pin_reg->mux_reg);
+       if (input)
+               reg &= ~0x2;
+       else
+               reg |= 0x2;
+       writel(reg, ipctl->base + pin_reg->mux_reg);
+
+       return 0;
+}
+
 static const struct pinmux_ops imx_pmx_ops = {
        .get_functions_count = imx_pmx_get_funcs_count,
        .get_function_name = imx_pmx_get_func_name,
        .get_function_groups = imx_pmx_get_groups,
        .set_mux = imx_pmx_set,
+       .gpio_request_enable = imx_pmx_gpio_request_enable,
+       .gpio_set_direction = imx_pmx_gpio_set_direction,
 };
 
 static int imx_pinconf_get(struct pinctrl_dev *pctldev,