[PATCH 4/8] pinctrl: freescale: imx: add ZERO_OFFSET_VALID flag

[Adrian Alonso]

- Add ZERO_OFFSET_VALID flag, on imx7d mux_conf reg
  offset is zero for iomuxc-lspr controller
- Do default initialization on parse group function.

Signed-off-by: Adrian Alonso <aalo...@freescale.com>
---
 drivers/pinctrl/freescale/pinctrl-imx.c | 23 +++++++++++++----------
 drivers/pinctrl/freescale/pinctrl-imx.h |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c 
b/drivers/pinctrl/freescale/pinctrl-imx.c
index d7b98ba..0440b0b 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -437,7 +437,7 @@ static void imx_pinconf_dbg_show(struct pinctrl_dev 
*pctldev,
        const struct imx_pin_reg *pin_reg = &info->pin_regs[pin_id];
        unsigned long config;
 
-       if (!pin_reg || pin_reg->conf_reg == -1) {
+       if (pin_reg->conf_reg == -1) {
                seq_printf(s, "N/A");
                return;
        }
@@ -536,21 +536,29 @@ static int imx_pinctrl_parse_groups(struct device_node 
*np,
                return -ENOMEM;
 
        for (i = 0; i < grp->npins; i++) {
-               u32 mux_reg = be32_to_cpu(*list++);
+               u32 mux_reg;
                u32 conf_reg;
                unsigned int pin_id;
                struct imx_pin_reg *pin_reg;
                struct imx_pin *pin = &grp->pins[i];
 
+               mux_reg = be32_to_cpu(*list++);
+               if (!(info->flags & ZERO_OFFSET_VALID) && !mux_reg)
+                       mux_reg = -1;
+
                if (info->flags & SHARE_MUX_CONF_REG) {
                        conf_reg = mux_reg;
                } else {
                        conf_reg = be32_to_cpu(*list++);
-                       if (!conf_reg)
+                       if (!(info->flags & ZERO_OFFSET_VALID) && !conf_reg)
                                conf_reg = -1;
                }
 
-               pin_id = mux_reg ? mux_reg / 4 : conf_reg / 4;
+               if (info->flags & ZERO_OFFSET_VALID)
+                       pin_id = mux_reg / 4;
+               else
+                       pin_id = mux_reg ? mux_reg / 4 : conf_reg / 4;
+
                pin_reg = &info->pin_regs[pin_id];
                pin->pin = pin_id;
                grp->pin_ids[i] = pin_id;
@@ -685,7 +693,7 @@ int imx_pinctrl_probe(struct platform_device *pdev,
 {
        struct imx_pinctrl *ipctl;
        struct resource *res;
-       int ret, i;
+       int ret;
 
        if (!info || !info->pins || !info->npins) {
                dev_err(&pdev->dev, "wrong pinctrl info\n");
@@ -703,11 +711,6 @@ int imx_pinctrl_probe(struct platform_device *pdev,
        if (!info->pin_regs)
                return -ENOMEM;
 
-       for (i = 0; i < info->npins; i++) {
-               info->pin_regs[i].mux_reg = -1;
-               info->pin_regs[i].conf_reg = -1;
-       }
-
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        ipctl->base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(ipctl->base))
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h 
b/drivers/pinctrl/freescale/pinctrl-imx.h
index 49e55d3..d22b8f6 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.h
+++ b/drivers/pinctrl/freescale/pinctrl-imx.h
@@ -84,6 +84,7 @@ struct imx_pinctrl_soc_info {
 };
 
 #define SHARE_MUX_CONF_REG     0x1
+#define ZERO_OFFSET_VALID      0x2
 
 #define NO_MUX         0x0
 #define NO_PAD         0x0
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html