diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-07-10 12:05:32 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-07-10 12:05:32 -0500 |
| commit | 859f24350e6e4313626f85161dd03f025a4dac59 (patch) | |
| tree | a025f68619045556e662326c8e1cbc147f9b633e /cpu/ppc4xx/gpio.c | |
| parent | 3473ab737282b08ad61841fcbb14c4d264a93a8e (diff) | |
| parent | e0320b1ebec13755911a53b0af12cbf3e5e49a65 (diff) | |
| download | u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.zip u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.gz u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'cpu/ppc4xx/gpio.c')
| -rw-r--r-- | cpu/ppc4xx/gpio.c | 4 |
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); |