diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-29 11:30:23 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-29 11:30:23 -0700 |
commit | 6fd9b70e1b8f5d715728510b8f6e2566101143f1 (patch) | |
tree | 962e169c8bd1b978a9091633f70544f8ce9ed7c0 /arch/arm/mach-exynos/include/mach | |
parent | f5142021129e25ef4171b0241c34837d322b9c72 (diff) | |
parent | 84bd48a04eff487570c9cdd91648835456ed65ac (diff) | |
download | op-kernel-dev-6fd9b70e1b8f5d715728510b8f6e2566101143f1.zip op-kernel-dev-6fd9b70e1b8f5d715728510b8f6e2566101143f1.tar.gz |
Merge branch 'next/dt-samsung-new' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt2
From Kukjin Kim:
* 'next/dt-samsung-new' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add nodes for dw_mmc controllers for Samsung EXYNOS5250 platforms
ARM: EXYNOS: Add AUXDATA support for MSHC controllers
ARM: EXYNOS: Add support for MSHC controller clocks
ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen
ARM: dts: use uart2 for console on smdkv310 and smdk5250
ARM: dts: Add basic dts file for Samsung Trats board
ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters
ARM: dts: Specify address and size cells for i2c controllers for EXYNOS4
ARM: dts: Assume status of all optional nodes as disabled for exynos4
ARM: EXYNOS: Use exynos4 prefix instead of exynos4210 on exynos4-dt
ARM: dts: Move parts common to EXYNOS4 from exynos4210.dtsi to exynos4.dtsi
Diffstat (limited to 'arch/arm/mach-exynos/include/mach')
-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 c72b675..5edbbe9 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -173,6 +173,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 |