diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-31 04:21:10 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-31 04:21:10 (GMT) |
| commit | 0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3 (patch) | |
| tree | d42e6c228e730cac0e530c0266f29926a6a171a9 /arch/arm/boot/dts/Makefile | |
| parent | bb195016513513c78954678c22d30a4b2d4a6b1f (diff) | |
| parent | 345e9bf08276395bd6620dfab56d1b679136d2ce (diff) | |
| download | linux-0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3.tar.xz | |
Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Merge "Samsung 3rd DT updates for v3.16" from Kukjin Kim:
- add dts files support for new SoCs
: exynos3250 SoC
: exynos5260 SoC and exynos5260-xyref5260 board
: exynos5410 SoC and exynos5410-smdk5410 board
: exynos5800 SoC and exynos5800-peach-pi board
- exynos4210-origen and exynos4412-origen
: enable RTC and WDT nodes
: use key code macros
- exynos5250-arndale
: use key code macros
- exynos5420-arndale-octa
: add secure firmware support
- exynos5440
: update watchdog node name
* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add secure firmware support for exynos5420-arndale-octa
ARM: dts: add pmu sysreg node to exynos3250
ARM: dts: correct the usb phy node in exynos5800-peach-pi
ARM: dts: correct the usb phy node in exynos5420-peach-pit
ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410
ARM: dts: add dts files for exynos3250 SoC
ARM: dts: add mfc node for exynos5800
ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi
ARM: dts: enable fimd for exynos5800-peach-pi
ARM: dts: enable display controller for exynos5800-peach-pi
ARM: dts: enable hdmi for exynos5800-peach-pi
ARM: dts: add dts file for exynos5800-peach-pi board
ARM: dts: add dts file for exynos5800 SoC
ARM: dts: add dts file for exynos5260-xyref5260 board
ARM: dts: add dts files for exynos5260 SoC
ARM: dts: update watchdog node name in exynos5440
ARM: dts: use key code macros on Origen and Arndale boards
ARM: dts: enable RTC and WDT nodes on Origen boards
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 33409a3..cbe223c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -73,11 +73,14 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos5250-arndale.dtb \ exynos5250-smdk5250.dtb \ exynos5250-snow.dtb \ + exynos5260-xyref5260.dtb \ + exynos5410-smdk5410.dtb \ exynos5420-arndale-octa.dtb \ exynos5420-peach-pit.dtb \ exynos5420-smdk5420.dtb \ exynos5440-sd5v1.dtb \ - exynos5440-ssdk5440.dtb + exynos5440-ssdk5440.dtb \ + exynos5800-peach-pi.dtb dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ ecx-2000.dtb |