MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)

This patch actually replaces the 'struct pad_desc' with a u64 cookie
to facilitate adding platform specific pad_ctrl settings to an
existing pad definition.

So, instead of:
	iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21;
	power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2;
	mxc_iomux_v3_setup_pad(&power_key);
one can write:
	mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2);

Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6

Signed-Off-By: Lothar Waßmann <LW@KARO-electronics.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 16 insertions, 9 deletions

diff --git a/arch/arm/plat-mxc/iomux-v3.c b/arch/arm/plat-mxc/iomux-v3.c
index 4cbbf2c6ea74..99a9cdb9d6be 100644
--- a/arch/arm/plat-mxc/iomux-v3.c
+++ b/arch/arm/plat-mxc/iomux-v3.c
@@ -34,17 +34,24 @@ static void __iomem *base;
 /*
  * configures a single pad in the iomuxer
  */
-int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t *pad)
+int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
 {
-        if (MUX_CTRL_OFS(pad))
-                __raw_writel(MUX_MODE(pad), base + MUX_CTRL_OFS(pad));
+        u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
+        u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
+        u32 sel_input_ofs = (pad & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT;
+        u32 sel_input = (pad & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT;
+        u32 pad_ctrl_ofs = (pad & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT;
+        u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
 
-        if (MUX_SELECT_INPUT_OFS(pad))
-                __raw_writel(MUX_SELECT_INPUT(pad),
-                        base + MUX_SELECT_INPUT_OFS(pad));
+        if (mux_ctrl_ofs)
+                __raw_writel(mux_mode, base + mux_ctrl_ofs);
+
+        if (sel_input_ofs)
+                __raw_writel(sel_input, base + sel_input_ofs);
+
+        if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
+                __raw_writel(pad_ctrl, base + pad_ctrl_ofs);
 
-        if (!(MUX_PAD_CTRL(pad) & NO_PAD_CTRL) && MUX_PAD_CTRL_OFS(pad))
-                __raw_writel(MUX_PAD_CTRL(pad), base + MUX_PAD_CTRL_OFS(pad));
         return 0;
 }
 EXPORT_SYMBOL(mxc_iomux_v3_setup_pad);
@@ -56,7 +63,7 @@ int mxc_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t *pad_list, unsigned count)
         int ret;
 
         for (i = 0; i < count; i++) {
-                ret = mxc_iomux_v3_setup_pad(p);
+                ret = mxc_iomux_v3_setup_pad(*p);
                 if (ret)
                         return ret;
                 p++;