diff options
Diffstat (limited to 'arch/arm/mach-davinci/mux.c')
-rw-r--r-- | arch/arm/mach-davinci/mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c index 8ff9d8aca60b..53734dee1f93 100644 --- a/arch/arm/mach-davinci/mux.c +++ b/arch/arm/mach-davinci/mux.c | |||
@@ -23,6 +23,7 @@ static DEFINE_SPINLOCK(mux_lock); | |||
23 | 23 | ||
24 | void davinci_mux_peripheral(unsigned int mux, unsigned int enable) | 24 | void davinci_mux_peripheral(unsigned int mux, unsigned int enable) |
25 | { | 25 | { |
26 | void __iomem *base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE); | ||
26 | u32 pinmux, muxreg = PINMUX0; | 27 | u32 pinmux, muxreg = PINMUX0; |
27 | 28 | ||
28 | if (mux >= DAVINCI_MUX_LEVEL2) { | 29 | if (mux >= DAVINCI_MUX_LEVEL2) { |
@@ -31,11 +32,11 @@ void davinci_mux_peripheral(unsigned int mux, unsigned int enable) | |||
31 | } | 32 | } |
32 | 33 | ||
33 | spin_lock(&mux_lock); | 34 | spin_lock(&mux_lock); |
34 | pinmux = davinci_readl(DAVINCI_SYSTEM_MODULE_BASE + muxreg); | 35 | pinmux = __raw_readl(base + muxreg); |
35 | if (enable) | 36 | if (enable) |
36 | pinmux |= (1 << mux); | 37 | pinmux |= (1 << mux); |
37 | else | 38 | else |
38 | pinmux &= ~(1 << mux); | 39 | pinmux &= ~(1 << mux); |
39 | davinci_writel(pinmux, DAVINCI_SYSTEM_MODULE_BASE + muxreg); | 40 | __raw_writel(pinmux, base + muxreg); |
40 | spin_unlock(&mux_lock); | 41 | spin_unlock(&mux_lock); |
41 | } | 42 | } |