summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx/gpio.c
diff options
context:
space:
mode:
authorDetlev Zundel <dzu@denx.de>2008-06-30 15:35:34 +0200
committerDetlev Zundel <dzu@denx.de>2008-06-30 15:38:24 +0200
commita524e112b424c6843800ea2f19d3a8cf01d0aa94 (patch)
tree9bb267b7324e95dd56945f9f16f822a434d34024 /cpu/ppc4xx/gpio.c
parent40777812316fc252c941665c0f60c148fd79d50f (diff)
parent745d8a0d3cea82e6d1753e14afb4588c34761b15 (diff)
downloadu-boot-imx-a524e112b424c6843800ea2f19d3a8cf01d0aa94.zip
u-boot-imx-a524e112b424c6843800ea2f19d3a8cf01d0aa94.tar.gz
u-boot-imx-a524e112b424c6843800ea2f19d3a8cf01d0aa94.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'cpu/ppc4xx/gpio.c')
-rw-r--r--cpu/ppc4xx/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/ppc4xx/gpio.c b/cpu/ppc4xx/gpio.c
index 37d3fa8..df99f53 100644
--- a/cpu/ppc4xx/gpio.c
+++ b/cpu/ppc4xx/gpio.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2007
+ * (C) Copyright 2007-2008
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -52,7 +52,7 @@ void gpio_config(int pin, int in_out, int gpio_alt, int out_val)
}
mask = 0x80000000 >> pin;
- mask2 = 0xc0000000 >> (pin2 << 1);
+ mask2 = 0xc0000000 >> pin2;
/* first set TCR to 0 */
out_be32((void *)GPIO0_TCR + offs, in_be32((void *)GPIO0_TCR + offs) & ~mask);