diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-05 05:00:46 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-05 05:00:46 +0100 |
| commit | d50673ed97a7ce609cf62bcd40c57517ada31806 (patch) | |
| tree | de1464fe1a4126be6b34762015afb8ad8a90a2f0 /arch/arm/mach-at91/include/mach/at91x40.h | |
| parent | Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlin... (diff) | |
| parent | Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9... (diff) | |
| download | linux-d50673ed97a7ce609cf62bcd40c57517ada31806.tar.xz linux-d50673ed97a7ce609cf62bcd40c57517ada31806.zip | |
Merge remote-tracking branch 'arm-soc/at91/base2+cleanup' into cleanup-base
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91x40.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91x40.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h index a57829f4fd18..90680217064e 100644 --- a/arch/arm/mach-at91/include/mach/at91x40.h +++ b/arch/arm/mach-at91/include/mach/at91x40.h @@ -28,18 +28,18 @@ #define AT91X40_ID_IRQ2 18 /* External IRQ 2 */ /* - * System Peripherals (offset from AT91_BASE_SYS) + * System Peripherals */ #define AT91_BASE_SYS 0xffc00000 -#define AT91_EBI (0xffe00000 - AT91_BASE_SYS) /* External Bus Interface */ -#define AT91_SF (0xfff00000 - AT91_BASE_SYS) /* Special Function */ -#define AT91_USART1 (0xfffcc000 - AT91_BASE_SYS) /* USART 1 */ -#define AT91_USART0 (0xfffd0000 - AT91_BASE_SYS) /* USART 0 */ -#define AT91_TC (0xfffe0000 - AT91_BASE_SYS) /* Timer Counter */ -#define AT91_PIOA (0xffff0000 - AT91_BASE_SYS) /* PIO Controller A */ -#define AT91_PS (0xffff4000 - AT91_BASE_SYS) /* Power Save */ -#define AT91_WD (0xffff8000 - AT91_BASE_SYS) /* Watchdog Timer */ +#define AT91_EBI 0xffe00000 /* External Bus Interface */ +#define AT91_SF 0xfff00000 /* Special Function */ +#define AT91_USART1 0xfffcc000 /* USART 1 */ +#define AT91_USART0 0xfffd0000 /* USART 0 */ +#define AT91_TC 0xfffe0000 /* Timer Counter */ +#define AT91_PIOA 0xffff0000 /* PIO Controller A */ +#define AT91_PS 0xffff4000 /* Power Save */ +#define AT91_WD 0xffff8000 /* Watchdog Timer */ /* * The AT91x40 series doesn't have a debug unit like the other AT91 parts. |