diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 13:16:25 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 13:16:25 +0100 |
| commit | 16a8cb5928f907b73117a170d309f6f1366e1628 (patch) | |
| tree | 8dd77adc1c23673e42e5f3791bf621a0c41904ac /arch/arm/boot/dts/Makefile | |
| parent | 3510c70df7694b282406020c51ccd67afc79dea5 (diff) | |
| parent | a427d15062ac46a00a22d2f0b9d05093c18ff2f1 (diff) | |
Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Pull "Samsung 2nd DT updates for v3.19" from Kukjin Kim:
- add micro SD card SDHCI node for exynos4412-trats
- add exynos4415 DT
- add exynos3250-rinato DT and sleep mode support
Note: based on previous tags/samsung-dt for v3.19
* tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add micro SD card SDHCI node for exynos4412-trats
ARM: dts: Add dts files for exynos4415 SoC
ARM: dts: Add sleep mode of regulator for exynos3250-rinato
ARM: dts: Add sleep mode pin configuration for exynos3250-rinato
ARM: dts: Add board dts file for exynos3250-rinato
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 05c7e3d933f3..71f68695c40c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -71,7 +71,8 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ da850-evm.dtb dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb -dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ +dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-rinato.dtb \ + exynos4210-origen.dtb \ exynos4210-smdkv310.dtb \ exynos4210-trats.dtb \ exynos4210-universal_c210.dtb \ |