blackfin: Move machine specific gpio_port_t structure back to blackfin arch folder.
PATCH 1/1 blackfin: Move machine specific gpio_port_t structure back to blackfin arch folder.
From: Steven Miao <[email protected]>
The gpio register mappings are different among blackfin processors.
Signed-off-by Steven Miao <[email protected]>
Signed-off-by Sonic Zhang <[email protected]>
--- arch/blackfin/cpu/Makefile | 2 +- arch/blackfin/cpu/gpio.c | 17 +++++++++++++++++ arch/blackfin/include/asm/gpio.h | 3 +++ drivers/gpio/adi_gpio2.c | 17 ----------------- 4 files changed, 21 insertions(+), 18 deletions(-)
arch/blackfin/cpu/Makefile +1 -1
@@ -18,7 +18,7 @@ CEXTRA := initcode.o SEXTRA := start.o SOBJS := interrupt.o cache.o COBJS-y += cpu.o -COBJS-$(CONFIG_ADI_GPIO1) += gpio.o +COBJS-y += gpio.o COBJS-y += interrupts.o COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o COBJS-y += os_log.o
arch/blackfin/cpu/gpio.c +17 -0
@@ -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
arch/blackfin/include/asm/gpio.h +3 -0
@@ -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
drivers/gpio/adi_gpio2.c +0 -17
@@ -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)
Signature · 1 line
1.8.2.3