diff options
| author | Reinhard Meyer <u-boot@emk-elektronik.de> | 2010-11-03 15:38:33 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-05-18 07:56:51 +0200 |
| commit | 83f1072e06d4e3b9eaceed39799042c7b3bbdbb1 (patch) | |
| tree | 6e125654946cfb6546973a2b9b4ea98f4a6c2986 /arch/arm/include/asm/arch-at91/gpio.h | |
| parent | 405e5919f28ab0a6955b74dd8123331a5d4c4ab1 (diff) | |
| download | talos-obmc-uboot-83f1072e06d4e3b9eaceed39799042c7b3bbdbb1.tar.gz talos-obmc-uboot-83f1072e06d4e3b9eaceed39799042c7b3bbdbb1.zip | |
AT91: fix related arch-at91 header files
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm/include/asm/arch-at91/gpio.h')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/gpio.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/include/asm/arch-at91/gpio.h b/arch/arm/include/asm/arch-at91/gpio.h index 716f81fa3c..293d0bf56b 100644 --- a/arch/arm/include/asm/arch-at91/gpio.h +++ b/arch/arm/include/asm/arch-at91/gpio.h @@ -18,7 +18,7 @@ #include <asm/arch/at91_pio.h> #include <asm/arch/hardware.h> -#ifdef CONFIG_AT91_LEGACY +#ifdef CONFIG_ATMEL_LEGACY #define PIN_BASE 32 @@ -192,13 +192,13 @@ #define AT91_PIN_PE31 (PIN_BASE + 0x80 + 31) static unsigned long at91_pios[] = { - AT91_PIOA, - AT91_PIOB, - AT91_PIOC, -#ifdef AT91_PIOD - AT91_PIOD, -#ifdef AT91_PIOE - AT91_PIOE + ATMEL_BASE_PIOA, + ATMEL_BASE_PIOB, + ATMEL_BASE_PIOC, +#ifdef ATMEL_BASE_PIOD + ATMEL_BASE_PIOD, +#ifdef ATMEL_BASE_PIOE + ATMEL_BASE_PIOE #endif #endif }; @@ -207,7 +207,7 @@ static inline void *pin_to_controller(unsigned pin) { pin -= PIN_BASE; pin /= 32; - return (void *)(AT91_BASE_SYS + at91_pios[pin]); + return (void *)(at91_pios[pin]); } static inline unsigned pin_to_mask(unsigned pin) |
