summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-08-12 11:47:54 +0200
committerWolfgang Denk <wd@denx.de>2008-08-12 11:47:54 +0200
commit224f7a56796868f544664a48b51c2450850e1b9c (patch)
tree7d20cf55239b4632d6d4251ada0383c1370bb5b0 /cpu
parentc9c101c660b3d1995045c61c7c6041f52b6cf335 (diff)
parent565ffbb9ee0ac0f49636621969bc66a02c4e2b44 (diff)
downloadu-boot-imx-224f7a56796868f544664a48b51c2450850e1b9c.zip
u-boot-imx-224f7a56796868f544664a48b51c2450850e1b9c.tar.gz
u-boot-imx-224f7a56796868f544664a48b51c2450850e1b9c.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm1136/mx31/generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm1136/mx31/generic.c b/cpu/arm1136/mx31/generic.c
index 29c08c1..dc031c9 100644
--- a/cpu/arm1136/mx31/generic.c
+++ b/cpu/arm1136/mx31/generic.c
@@ -81,12 +81,12 @@ void mx31_gpio_mux(unsigned long mode)
{
unsigned long reg, shift, tmp;
- reg = IOMUXC_BASE + (mode & 0xfc);
+ reg = IOMUXC_BASE + (mode & 0x1fc);
shift = (~mode & 0x3) * 8;
tmp = __REG(reg);
tmp &= ~(0xff << shift);
- tmp |= ((mode >> 8) & 0xff) << shift;
+ tmp |= ((mode >> IOMUX_MODE_POS) & 0xff) << shift;
__REG(reg) = tmp;
}