Merge branch 'master' of git://git.denx.de/u-boot-blackfin

Easy to resolve conflict on the GPIO change.

Conflicts:
	arch/blackfin/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile
index 9bf544d8006aed80c6702e60d537da3c03820073..243dc22a0c61470e9c01ca8542f0884168eafc89 100644 (file)
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@ -14,7 +14,7 @@ extra-y += initcode.o
 extra-y += start.o
 obj-y    := interrupt.o cache.o
 obj-y  += cpu.o
-obj-$(CONFIG_ADI_GPIO1) += gpio.o
+obj-y += gpio.o
 obj-y  += interrupts.o
 obj-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
 obj-y  += os_log.o

diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c
index 218f57ed389f26c3fb165684ed156adacd0db59d..2409c300ed1441e6660fbd8475ae3e5ee01023f4 100644 (file)
--- a/arch/blackfin/cpu/cpu.c
+++ b/arch/blackfin/cpu/cpu.c
@@ -104,6 +104,9 @@ void cpu_init_f(ulong bootflag, ulong loaded_from_ldr)
 
        serial_early_puts("Board init flash\n");
        board_init_f(bootflag);
+
+       /* should not be reached */
+       while (1);
 }
 
 int exception_init(void)

diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c
index f9aff4d894ae95f2d69239e60127485cc5b1a1cc..5e9c68af85ac0460ace557d867a3414d5455bb57 100644 (file)
--- a/arch/blackfin/cpu/gpio.c
+++ b/arch/blackfin/cpu/gpio.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 
+#ifdef CONFIG_ADI_GPIO1
 #if ANOMALY_05000311 || ANOMALY_05000323
 enum {
        AWA_data = SYSCR,
@@ -774,3 +775,19 @@ void gpio_labels(void)
                        continue;
        }
 }
+#else
+struct gpio_port_t * const gpio_array[] = {
+       (struct gpio_port_t *)PORTA_FER,
+       (struct gpio_port_t *)PORTB_FER,
+       (struct gpio_port_t *)PORTC_FER,
+       (struct gpio_port_t *)PORTD_FER,
+       (struct gpio_port_t *)PORTE_FER,
+       (struct gpio_port_t *)PORTF_FER,
+       (struct gpio_port_t *)PORTG_FER,
+#if defined(CONFIG_BF54x)
+       (struct gpio_port_t *)PORTH_FER,
+       (struct gpio_port_t *)PORTI_FER,
+       (struct gpio_port_t *)PORTJ_FER,
+#endif
+};
+#endif

diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
index 58a619110779ed628e51248defb7ae58b02cbfb1..376ec02b650897fa8a52b15ff38f8cc8abf1a48d 100644 (file)
--- a/arch/blackfin/include/asm/gpio.h
+++ b/arch/blackfin/include/asm/gpio.h
@@ -8,6 +8,7 @@
 #define __ARCH_BLACKFIN_GPIO_H__
 
 #include <asm-generic/gpio.h>
+#include <asm/portmux.h>
 
 #define gpio_bank(x)   ((x) >> 4)
 #define gpio_bit(x)    (1<<((x) & 0xF))
@@ -141,6 +142,8 @@ struct gpio_port_t {
        unsigned short dummy16;
        unsigned short inen;
 };
+#else
+extern struct gpio_port_t * const gpio_array[];
 #endif
 
 #ifdef ADI_SPECIAL_GPIO_BANKS

diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index 051073cee3b5d47a2caeb4a9e600e3ed616aa866..88cd65b87fcfa202d941d66c531da7e62426410e 100644 (file)
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -10,22 +10,6 @@
 #include <common.h>
 #include <asm/errno.h>
 #include <asm/gpio.h>
-#include <asm/portmux.h>
-
-static struct gpio_port_t * const gpio_array[] = {
-       (struct gpio_port_t *)PORTA_FER,
-       (struct gpio_port_t *)PORTB_FER,
-       (struct gpio_port_t *)PORTC_FER,
-       (struct gpio_port_t *)PORTD_FER,
-       (struct gpio_port_t *)PORTE_FER,
-       (struct gpio_port_t *)PORTF_FER,
-       (struct gpio_port_t *)PORTG_FER,
-#if defined(CONFIG_BF54x)
-       (struct gpio_port_t *)PORTH_FER,
-       (struct gpio_port_t *)PORTI_FER,
-       (struct gpio_port_t *)PORTJ_FER,
-#endif
-};
 
 #define RESOURCE_LABEL_SIZE    16
 
@@ -98,7 +82,6 @@ static void port_setup(unsigned gpio, unsigned short usage)
        else
                gpio_array[gpio_bank(gpio)]->port_fer_set = gpio_bit(gpio);
 #endif
-       SSYNC();
 }
 
 inline void portmux_setup(unsigned short per)