diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-04 11:43:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-04 11:43:53 -0800 |
| commit | 4ac383ed3a12a7a56d70456403b7abd95477d840 (patch) | |
| tree | c72b49abd018aaedd0d5909bae914c0269977abb /arch/arm/boot/dts/Makefile | |
| parent | 11b35a352521b740944455b45dbee190e9c893a4 (diff) | |
| parent | b67a55125f1413902f7db6d167a8d9e4154386bf (diff) | |
Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
From Kukjin Kim:
Samsung DT 3rd updates for v3.14
- add exynos4412-tiny4412 board dt for FriendlyARM's TINY4412
board including initial support UART, SD card and LEDs
- add exynos5420-arndale-octa board dt for Arndale Octa board
* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add support for EXYNOS4412 based TINY4412 board
ARM: dts: Add initial support for Arndale Octa board
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4f93eefb4c29..21fdbbe20390 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -62,10 +62,12 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4412-odroidx.dtb \ exynos4412-origen.dtb \ exynos4412-smdk4412.dtb \ + exynos4412-tiny4412.dtb \ exynos4412-trats2.dtb \ exynos5250-arndale.dtb \ exynos5250-smdk5250.dtb \ exynos5250-snow.dtb \ + exynos5420-arndale-octa.dtb \ exynos5420-smdk5420.dtb \ exynos5440-sd5v1.dtb \ exynos5440-ssdk5440.dtb |