Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / cpu / ppc4xx / gpio.c

diff --git a/cpu/ppc4xx/gpio.c b/cpu/ppc4xx/gpio.c
index 5235203..50f2fdf 100644 (file)
--- a/cpu/ppc4xx/gpio.c
+++ b/cpu/ppc4xx/gpio.c
@@ -186,6 +186,7 @@ void gpio_set_chip_configuration(void)
                                                out32(GPIO0_TCR, reg);
                                        }
 
+#ifdef GPIO1
                                        if (gpio_core == GPIO1) {
                                                /*
                                                 * Setup output value
@@ -193,16 +194,17 @@ void gpio_set_chip_configuration(void)
                                                 * 0 -> low level
                                                 * else -> don't touch
                                                 */
-                                               reg = in32(GPIO0_OR);
+                                               reg = in32(GPIO1_OR);
                                                if (gpio_tab[gpio_core][i].out_val == GPIO_OUT_1)
                                                        reg |= (0x80000000 >> (i));
                                                else if (gpio_tab[gpio_core][i].out_val == GPIO_OUT_0)
                                                        reg &= ~(0x80000000 >> (i));
-                                               out32(GPIO0_OR, reg);
+                                               out32(GPIO1_OR, reg);
 
                                                reg = in32(GPIO1_TCR) | (0x80000000 >> (i));
                                                out32(GPIO1_TCR, reg);
                                        }
+#endif /* GPIO1 */
 
                                        reg = in32(GPIO_OS(core_add+offs))
                                                & ~(GPIO_MASK >> (j*2));