summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-19 15:06:48 -0700
committerOlof Johansson <olof@lixom.net>2014-07-19 15:06:48 -0700
commitaaaa10b0961f1fca534dea100ace0fc2991a07dd (patch)
tree754fc858ed5e0a4de754c7564859b9afad0f0dd9 /arch/arm/boot/dts/Makefile
parent223f93ed7e8942a250c1a7ea99ede72f5fd4cc70 (diff)
parentccaba4527156da1619a23bafcb944e8e029d0573 (diff)
downloadblackbird-op-linux-aaaa10b0961f1fca534dea100ace0fc2991a07dd.tar.gz
blackbird-op-linux-aaaa10b0961f1fca534dea100ace0fc2991a07dd.zip
Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Merge "Samsung DT updates for v3.17" from Kukjin Kim: exynos3250: add i2s dt for audio interface exynos4 - cleanup arm-pmu node because of 4 pmu on exynos4412 but 2 pmu on other exynos4 SoCs - add support sub-nodes to exynos usb host for exynos4 exynos4412-odroid-common - fix T-FLASH hotplug detection - disable 'always on' for BUCK8 - add support for GPIO based buttons - add MAX98090 audio codec exynos4412-odroidx2 and exynos4412-odroidu3 - refactor exynos4412-odroidx and exynos4412-odroid-common for odroid-x2 and u2/u3 exynos4412-odroidx - add support for USB phy, host and device - enable common hardware blocks, secure firmware calls, watchdog, g2d and fimc (mem2mem) multimedia accelerators - add support for USB phy, host and device - correct memory size exynos5410 - fill in CPU clock-frequency property to avoid warning exynos5420 - remove display pd because of instability exynos5420-peach-pit and exynos5800-peach-pi - sort nodes each other to check its differences easily - enable audio support and add sound-card name property - add mask-tpm-reset node - add cros_ec including keyboard, i2c tunnel and tps65090 and battery under the i2c tunnel * tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add I2S dt node for exynos3250 ARM: dts: Add cros_ec to exynos5420-peach-pit and exynos5800-peach-pi ARM: dts: clean up arm-pmu node for exynos4 ARM: dts: remove display power domain for exynos5420 ARM: dts: Add sound nodes for Odroid-X2/U3 boards ARM: dts: fix T-FLASH hotplug detection for exynos4412-odroid-common ARM: dts: add support for GPIO buttons for exynos4412-odroid ARM: dts: disable 'always on' for BUCK8 regulator for exynos4412-odroid-common ARM: dts: refactor Odroid DTS file and add support for Odroid X2 and U2/U3 ARM: dts: correct memory size for exynos4412-odroidx ARM: dts: add support for USB phy, host and device for exynos4412-odroidx ARM: dts: enable common hardware blocks for exynos4412-odroidx ARM: dts: add port sub-nodes to exynos usb host modules for exynos4 ARM: dts: Add mask-tpm-reset node in exynos5800-peach-pi ARM: dts: Add mask-tpm-reset node in exynos5420-peach-pit ARM: dts: Add sound-card name for Snow/Peach-Pit/Peach-Pi ARM: dts: Fill in CPU clock-frequency for exynos5410 ARM: dts: Sort nodes within Peach-pit/Peach-pi dts files ARM: dts: Enable audio support for exynos5800-peach-pi
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 922fa5c99b2c..81bd72af529e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -66,7 +66,9 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
exynos4210-smdkv310.dtb \
exynos4210-trats.dtb \
exynos4210-universal_c210.dtb \
+ exynos4412-odroidu3.dtb \
exynos4412-odroidx.dtb \
+ exynos4412-odroidx2.dtb \
exynos4412-origen.dtb \
exynos4412-smdk4412.dtb \
exynos4412-tiny4412.dtb \
OpenPOWER on IntegriCloud