diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-22 22:37:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-22 22:37:16 +0200 |
| commit | 39e9b7c3c386f811fa021d1852518e54ff12af05 (patch) | |
| tree | a53282ceb6024bc3887c9db288c27685955ca6b9 /arch | |
| parent | 95bc39e848dd3f741a064c826d1c282c48125d41 (diff) | |
| parent | 23fdf0580660edf38cb7118f05b8865f2f73c674 (diff) | |
| download | u-boot-imx-39e9b7c3c386f811fa021d1852518e54ff12af05.zip u-boot-imx-39e9b7c3c386f811fa021d1852518e54ff12af05.tar.gz u-boot-imx-39e9b7c3c386f811fa021d1852518e54ff12af05.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/orion5x/cpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/cpu/arm926ejs/orion5x/cpu.c index c2f5253..03c6d06 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c +++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c @@ -260,10 +260,10 @@ int arch_misc_init(void) /* Set CPIOs and MPPs - values provided by board include file */ - writel(ORION5X_MPP_BASE+0x00, ORION5X_MPP0_7); - writel(ORION5X_MPP_BASE+0x04, ORION5X_MPP8_15); - writel(ORION5X_MPP_BASE+0x50, ORION5X_MPP16_23); - writel(ORION5X_GPIO_BASE+0x04, ORION5X_GPIO_OUT_ENABLE); + writel(ORION5X_MPP0_7, ORION5X_MPP_BASE+0x00); + writel(ORION5X_MPP8_15, ORION5X_MPP_BASE+0x04); + writel(ORION5X_MPP16_23, ORION5X_MPP_BASE+0x50); + writel(ORION5X_GPIO_OUT_ENABLE, ORION5X_GPIO_BASE+0x04); return 0; } |