diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:15:53 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:15:53 +0000 |
commit | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (patch) | |
tree | 4022b9f2dcd33cd567afd88c37d5796d4e61df66 /arch/arm/mach-exynos/include/mach/map.h | |
parent | 8a44930a11de8d66f92145fd2d2464ab4fba696b (diff) | |
parent | 74ac23a3e4962bf4f935a5579ae08754d21f9d5a (diff) | |
download | talos-obmc-linux-155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511.tar.gz talos-obmc-linux-155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511.zip |
Merge branch 'next-samsung-devel-mmc-spi5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/driver
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/map.h')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 058541d45af0..e6ba01d115f6 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -87,6 +87,10 @@ #define EXYNOS4_PA_SYSMMU_TV 0x12E20000 #define EXYNOS4_PA_SYSMMU_MFC_L 0x13620000 #define EXYNOS4_PA_SYSMMU_MFC_R 0x13630000 +#define EXYNOS4_PA_SPI0 0x13920000 +#define EXYNOS4_PA_SPI1 0x13930000 +#define EXYNOS4_PA_SPI2 0x13940000 + #define EXYNOS4_PA_GPIO1 0x11400000 #define EXYNOS4_PA_GPIO2 0x11000000 @@ -148,6 +152,9 @@ #define S3C_PA_RTC EXYNOS4_PA_RTC #define S3C_PA_WDT EXYNOS4_PA_WATCHDOG #define S3C_PA_UART EXYNOS4_PA_UART +#define S3C_PA_SPI0 EXYNOS4_PA_SPI0 +#define S3C_PA_SPI1 EXYNOS4_PA_SPI1 +#define S3C_PA_SPI2 EXYNOS4_PA_SPI2 #define S5P_PA_CHIPID EXYNOS4_PA_CHIPID #define S5P_PA_EHCI EXYNOS4_PA_EHCI |