aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2010-10-19 20:19:13 +0200
committerWolfgang Denk <wd@denx.de>2010-10-20 00:18:23 +0200
commitd078b7c2ec8624e084e1493304816949ff382bda (patch)
treea7e12ce69a547c54bb37a6987294503bd882024c /arch
parentb18815752f3d6db27877606e4e069e3f6cfe3a19 (diff)
downloadu-boot-linaro-stable-d078b7c2ec8624e084e1493304816949ff382bda.tar.gz
MX31: Removed warnings for iomux function
Removed warnings generated in the mx31_set_pad() function. Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/arm1136/mx31/generic.c7
-rw-r--r--arch/arm/include/asm/arch-mx31/mx31.h1
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index cbe8243ab..8bd23ee87 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -93,17 +93,16 @@ void mx31_gpio_mux(unsigned long mode)
void mx31_set_pad(enum iomux_pins pin, u32 config)
{
- u32 field, l;
- void *reg;
+ u32 field, l, reg;
pin &= IOMUX_PADNUM_MASK;
reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4;
field = (pin + 2) % 3;
- l = __raw_readl(reg);
+ l = __REG(reg);
l &= ~(0x1ff << (field * 10));
l |= config << (field * 10);
- __raw_writel(l, reg);
+ __REG(reg) = l;
}
diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h
index 5a5aa114a..a755212f0 100644
--- a/arch/arm/include/asm/arch-mx31/mx31.h
+++ b/arch/arm/include/asm/arch-mx31/mx31.h
@@ -27,6 +27,7 @@
extern u32 mx31_get_ipg_clk(void);
#define imx_get_uartclk mx31_get_ipg_clk
extern void mx31_gpio_mux(unsigned long mode);
+extern void mx31_set_pad(enum iomux_pins pin, u32 config);
void mx31_uart1_hw_init(void);
void mx31_spi2_hw_init(void);