diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-12-02 15:01:11 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 17:39:41 +0100 |
commit | 0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd (patch) | |
tree | 321ba2a255adc7df72620b5d8233fbac7bf32229 /arch/arm/plat-spear/include/mach/spear.h | |
parent | ARM: spear: merge Kconfig files (diff) | |
download | linux-0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd.tar.xz linux-0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd.zip |
ARM: spear: move spear.h and misc_regs.h into plat-spear
The spear13xx version of spear.h is completely different from
the newly combined spear3xx/spear6xx version, but we can never
build ARMv5 and ARMv7 platforms together, so there is no
harm in putting all the contents into a single file and adding
appropriate ifdefs.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to '')
-rw-r--r-- | arch/arm/plat-spear/include/mach/spear.h (renamed from arch/arm/mach-spear3xx/include/mach/spear.h) | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/spear.h b/arch/arm/plat-spear/include/mach/spear.h index ee5a774caae1..2198ab96df9d 100644 --- a/arch/arm/mach-spear3xx/include/mach/spear.h +++ b/arch/arm/plat-spear/include/mach/spear.h @@ -15,6 +15,8 @@ #include <asm/memory.h> +#if defined(CONFIG_ARCH_SPEAR3XX) || defined (CONFIG_ARCH_SPEAR6XX) + /* ICM1 - Low speed connection */ #define SPEAR_ICM1_2_BASE UL(0xD0000000) #define VA_SPEAR_ICM1_2_BASE UL(0xFD000000) @@ -55,5 +57,45 @@ #define SPEAR320_UART5_PCLK_SHIFT 11 #define SPEAR320_UART6_PCLK_SHIFT 12 #define SPEAR320_RS485_PCLK_SHIFT 13 +#endif /* SPEAR3xx || SPEAR6XX */ + +#ifdef CONFIG_ARCH_SPEAR13XX + +#define PERIP_GRP2_BASE UL(0xB3000000) +#define VA_PERIP_GRP2_BASE IOMEM(0xFE000000) +#define MCIF_SDHCI_BASE UL(0xB3000000) +#define SYSRAM0_BASE UL(0xB3800000) +#define VA_SYSRAM0_BASE IOMEM(0xFE800000) +#define SYS_LOCATION (VA_SYSRAM0_BASE + 0x600) + +#define PERIP_GRP1_BASE UL(0xE0000000) +#define VA_PERIP_GRP1_BASE IOMEM(0xFD000000) +#define UART_BASE UL(0xE0000000) +#define VA_UART_BASE IOMEM(0xFD000000) +#define SSP_BASE UL(0xE0100000) +#define MISC_BASE UL(0xE0700000) +#define VA_MISC_BASE IOMEM(0xFD700000) + +#define A9SM_AND_MPMC_BASE UL(0xEC000000) +#define VA_A9SM_AND_MPMC_BASE IOMEM(0xFC000000) + +/* A9SM peripheral offsets */ +#define A9SM_PERIP_BASE UL(0xEC800000) +#define VA_A9SM_PERIP_BASE IOMEM(0xFC800000) +#define VA_SCU_BASE (VA_A9SM_PERIP_BASE + 0x00) + +#define L2CC_BASE UL(0xED000000) +#define VA_L2CC_BASE IOMEM(UL(0xFB000000)) + +/* others */ +#define DMAC0_BASE UL(0xEA800000) +#define DMAC1_BASE UL(0xEB000000) +#define MCIF_CF_BASE UL(0xB2800000) + +/* Debug uart for linux, will be used for debug and uncompress messages */ +#define SPEAR_DBG_UART_BASE UART_BASE +#define VA_SPEAR_DBG_UART_BASE VA_UART_BASE + +#endif /* SPEAR13XX */ #endif /* __MACH_SPEAR_H */ |