diff options
| author | Tom Rini <trini@ti.com> | 2013-11-04 09:28:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-04 09:28:08 -0500 |
| commit | c0bb110b695130866838518e680bdd5473e47928 (patch) | |
| tree | 590563a50a027ad53867b2144e763de02427db59 /drivers | |
| parent | ae12c751e5532904090c23f079e4b59160caef52 (diff) | |
| parent | cae4d0403c0863176f228d410d6a29b3f4b9d595 (diff) | |
| download | blackbird-obmc-uboot-c0bb110b695130866838518e680bdd5473e47928.tar.gz blackbird-obmc-uboot-c0bb110b695130866838518e680bdd5473e47928.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/adi_gpio2.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c index 051073cee3..88cd65b87f 100644 --- 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) |
