From e1add532beea11c0089f23c2cc8844b0b1c9f30d Mon Sep 17 00:00:00 2001 From: "Arnaud Patard (Rtp)" Date: Wed, 3 Nov 2010 15:54:36 +0100 Subject: [PATCH] --- yaml --- r: 226100 b: refs/heads/master c: 28d6a7a2f37a349a2292e52a87d76f06f55dc9d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/iomux-v3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91d3b0e67f2e..231ce15b15a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2932bf47001697fc48e89f1d136532703ed4779 +refs/heads/master: 28d6a7a2f37a349a2292e52a87d76f06f55dc9d8 diff --git a/trunk/arch/arm/plat-mxc/iomux-v3.c b/trunk/arch/arm/plat-mxc/iomux-v3.c index 975ca7cdf9ad..4cbbf2c6ea74 100644 --- a/trunk/arch/arm/plat-mxc/iomux-v3.c +++ b/trunk/arch/arm/plat-mxc/iomux-v3.c @@ -41,7 +41,7 @@ int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t *pad) if (MUX_SELECT_INPUT_OFS(pad)) __raw_writel(MUX_SELECT_INPUT(pad), - base + MUX_SELECT_INPUT(pad)); + base + MUX_SELECT_INPUT_OFS(pad)); 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));