summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/iomux-v3.c
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2010-10-26 14:28:31 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-11-24 09:56:58 +0100
commit8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9 (patch)
tree56f3a67b1cf74a670c026ab14cc872cf3accccb8 /arch/arm/plat-mxc/iomux-v3.c
parentMerge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 i... (diff)
downloadlinux-8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9.tar.xz
linux-8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9.zip
ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie
The following patch is a first step to convert the 'struct pad_desc' to a bitmapped cookie to facilitate adding platform specific pullup or drive strength definitions to existing pad definitions without need to rewrite the complete pad def. The patch wraps 'struct pad_desc' in an opaque data type and introduces macros to access the individual members. This patch does not constitute any functional change! Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/iomux-v3.c')
-rw-r--r--arch/arm/plat-mxc/iomux-v3.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/plat-mxc/iomux-v3.c b/arch/arm/plat-mxc/iomux-v3.c
index b318c6a222d5..975ca7cdf9ad 100644
--- a/arch/arm/plat-mxc/iomux-v3.c
+++ b/arch/arm/plat-mxc/iomux-v3.c
@@ -32,26 +32,26 @@
static void __iomem *base;
/*
- * setups a single pad in the iomuxer
+ * configures a single pad in the iomuxer
*/
-int mxc_iomux_v3_setup_pad(struct pad_desc *pad)
+int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t *pad)
{
- if (pad->mux_ctrl_ofs)
- __raw_writel(pad->mux_mode, base + pad->mux_ctrl_ofs);
+ if (MUX_CTRL_OFS(pad))
+ __raw_writel(MUX_MODE(pad), base + MUX_CTRL_OFS(pad));
- if (pad->select_input_ofs)
- __raw_writel(pad->select_input,
- base + pad->select_input_ofs);
+ if (MUX_SELECT_INPUT_OFS(pad))
+ __raw_writel(MUX_SELECT_INPUT(pad),
+ base + MUX_SELECT_INPUT(pad));
- if (!(pad->pad_ctrl & NO_PAD_CTRL) && pad->pad_ctrl_ofs)
- __raw_writel(pad->pad_ctrl, base + pad->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);
-int mxc_iomux_v3_setup_multiple_pads(struct pad_desc *pad_list, unsigned count)
+int mxc_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t *pad_list, unsigned count)
{
- struct pad_desc *p = pad_list;
+ iomux_v3_cfg_t *p = pad_list;
int i;
int ret;