diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 18:55:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 18:55:15 -0700 |
| commit | e7b5ec998aacd69e22472e12a62f86d803e0033b (patch) | |
| tree | 8bfcde38dc846aeb329e8640f31420c2a63cd63b /arch/arm/mach-exynos/include/mach/map.h | |
| parent | 95360fd63606918167a5365b770a6d28d333f0ed (diff) | |
| parent | 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2 (diff) | |
| download | blackbird-op-linux-e7b5ec998aacd69e22472e12a62f86d803e0033b.tar.gz blackbird-op-linux-e7b5ec998aacd69e22472e12a62f86d803e0033b.zip | |
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc device tree updates, take 2 from Olof Johansson:
"This branch contains mostly a set of changes for device tree bindings
on Samsung Exynos. It was staged behind the other branches due to
dependencies on pincontrol and board changes."
Fix up trivial conflict in drivers/clocksource/Makefile due to earlier
conflict resolution.
* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
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/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 |
