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, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index e229a7476f0a..bcf83fc7e701 100644
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -237,7 +237,7 @@ static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97)
                 return;
         }
 
-        mxc_iomux_v3_setup_pad(&txfs_gpio);
+        mxc_iomux_v3_setup_pad(txfs_gpio);
 
         /* warm reset */
         gpio_direction_output(AC97_GPIO_TXFS, 1);
@@ -245,7 +245,7 @@ static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97)
         gpio_set_value(AC97_GPIO_TXFS, 0);
 
         gpio_free(AC97_GPIO_TXFS);
-        mxc_iomux_v3_setup_pad(&txfs);
+        mxc_iomux_v3_setup_pad(txfs);
 }
 
 static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97)
@@ -269,9 +269,9 @@ static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97)
         if (ret)
                 goto err3;
 
-        mxc_iomux_v3_setup_pad(&txfs_gpio);
-        mxc_iomux_v3_setup_pad(&txd_gpio);
-        mxc_iomux_v3_setup_pad(&reset_gpio);
+        mxc_iomux_v3_setup_pad(txfs_gpio);
+        mxc_iomux_v3_setup_pad(txd_gpio);
+        mxc_iomux_v3_setup_pad(reset_gpio);
 
         gpio_direction_output(AC97_GPIO_TXFS, 0);
         gpio_direction_output(AC97_GPIO_TXD, 0);
@@ -281,8 +281,8 @@ static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97)
         udelay(10);
         gpio_direction_output(AC97_GPIO_RESET, 1);
 
-        mxc_iomux_v3_setup_pad(&txd);
-        mxc_iomux_v3_setup_pad(&txfs);
+        mxc_iomux_v3_setup_pad(txd);
+        mxc_iomux_v3_setup_pad(txfs);
 
         gpio_free(AC97_GPIO_RESET);
 err3: