diff options
author | Olof Johansson | 2015-01-27 03:41:45 +0100 |
---|---|---|
committer | Olof Johansson | 2015-01-27 03:41:45 +0100 |
commit | 7c83955a6229f2e82290cea3250441a57b412b6d (patch) | |
tree | d9027f23f07ae66df8a25c8f96048a8f4eca332f /arch/arm/boot/dts/Makefile | |
parent | ARM: dts: re-fromat AT91 part to match other entries (diff) | |
parent | ARM: dts: Configure regulators for suspend on exynos Peach boards (diff) | |
download | kernel-qcow2-linux-7c83955a6229f2e82290cea3250441a57b412b6d.tar.gz kernel-qcow2-linux-7c83955a6229f2e82290cea3250441a57b412b6d.tar.xz kernel-qcow2-linux-7c83955a6229f2e82290cea3250441a57b412b6d.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.20" from Kukjin Kim:
- exynos3250
: add exynos_usbphy node and hsotg nodes
- exynos3250-rinato
: enable usb
: cleanup and use macro for gpio-keys
: add fimd and Panel devices support
- exynos3250-monk
: enable usb
: cleanup and use macro for gpio-keys
- exynos5250-snow
: add power and lid gpio-keys pinctrl
- exynos5420-peach-pit and exynos5800-peach-pi
: configure regulators for suspend
: set always on for USB webCam regulators
: add lid GPIO key device
- exynos5422
: add support new board Odroid XU3
- dt-bindings
: add exynos-chipid
* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Configure regulators for suspend on exynos Peach boards
ARM: dts: Set Peach boards USB WebCam regulators to always on
ARM: dts: Add lid GPIO key device node for Peach boards
ARM: dts: Add power and lid GPIO keys pinctrl for exynos5250-snow
Documentation: dt-bindings: add exynos-chipid binding information
ARM: dts: add Panel device support for exynos3250-rinato
ARM: dts: add fimd device support for exynos3250-rinato
ARM: dts: use macro in gpio keys for exynos3250 boards
ARM: dts: remove unnecessary gpio-key nodes for exynos3250 boards
ARM: dts: Enable USB node for exynos3250-monk
ARM: dts: Enable USB node for exynos3250-rinato
ARM: dts: Add hsotg node for exynos3250
ARM: dts: Add exynos_usbphy node for exynos3250
ARM: dts: Add dts file for Odroid XU3 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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 081e20ea7906..db5ce52ee510 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -105,6 +105,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ exynos5420-arndale-octa.dtb \ exynos5420-peach-pit.dtb \ exynos5420-smdk5420.dtb \ + exynos5422-odroidxu3.dtb \ exynos5440-sd5v1.dtb \ exynos5440-ssdk5440.dtb \ exynos5800-peach-pi.dtb |