diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:37:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:37:01 -0700 |
| commit | 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2 (patch) | |
| tree | eee3e1cbe481ac38614ab621122626bf5248372e /arch/arm/mach-exynos/include/mach/map.h | |
| parent | a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 (diff) | |
| parent | 6fd9b70e1b8f5d715728510b8f6e2566101143f1 (diff) | |
| download | blackbird-op-linux-7b27fa258c8f2670a8c09bbc6c4b2c874d155da2.tar.gz blackbird-op-linux-7b27fa258c8f2670a8c09bbc6c4b2c874d155da2.zip | |
Merge branch 'next/dt2' into HEAD
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 5aa77f996e59..8480849affb9 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -177,6 +177,10 @@ #define EXYNOS4_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) #define EXYNOS4_PA_DWMCI 0x12550000 +#define EXYNOS5_PA_DWMCI0 0x12200000 +#define EXYNOS5_PA_DWMCI1 0x12210000 +#define EXYNOS5_PA_DWMCI2 0x12220000 +#define EXYNOS5_PA_DWMCI3 0x12230000 #define EXYNOS4_PA_HSOTG 0x12480000 #define EXYNOS4_PA_USB_HSPHY 0x125B0000 |
