diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 13:29:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 13:29:46 +0100 |
| commit | bcc8cef7c43c46ca0467be725d677e2a8da806c0 (patch) | |
| tree | 0d40dd17905ff892cc69426b0a9c1667e604e7f6 /arch/arm/boot/dts/Makefile | |
| parent | 16a8cb5928f907b73117a170d309f6f1366e1628 (diff) | |
| parent | 1888eb75e68caceaab2fe0db820bd6ed574a468f (diff) | |
| download | op-kernel-dev-bcc8cef7c43c46ca0467be725d677e2a8da806c0.zip op-kernel-dev-bcc8cef7c43c46ca0467be725d677e2a8da806c0.tar.gz | |
Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Pull "Samsung 3rd DT updates for v3.19" from Kukjin Kim:
- exynos3250
: remove unused bootargs on exynos3250-rinato
: add new board dt file for exynos3250-monk
- exynos4
: add missing clock for MFC
: specify default clocks for camera
- exynos4x12
: add TMU related DT nodes
- exynos4412-trats2
: add max77693-haptic and pwm nodes, enable TMU support
- exynos4412-odroid
: specify audio clock parents and rates
- exynos5250 and exynos5420
: add syscon based phandle to i2c device nodes
- exynos5250-spring
: add trackpad, temperature sensor and usb3505 pinctrl
Note: based on previous tags/samsung-dt-2 for v3.19
* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add sysreg phandle to i2c device nodes for exynos
ARM: dts: Remove unused bootargs from exynos3250-rinato
ARM: dts: add board dts file for Exynos3250-based Monk board
Documentation: devicetree: Add Exynos-based boards compatible string
ARM: dts: add missing clock to MFC device for exynos4
ARM: dts: Specify audio clock parents and rates for exynos4412-odroid-common
ARM: dts: Add trackpad to exynos5250-spring
ARM: dts: Add temperature sensor to exynos5250-spring
ARM: dts: Add usb3503 pinctrl to exynos5250-spring
ARM: dts: Add max77693-haptic node for exynos4412-trats2
ARM: dts: add pwm node for exynos4412-trats2
ARM: dts: Specify default clocks for Exynos4 camera devices
ARM: dts: Enable TMU support for exynos4412-trats2
ARM: dts: Device tree node definition for TMU on exynos4x12
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 71f6869..b242f82 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) += exynos3250-rinato.dtb \ +dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \ + exynos3250-rinato.dtb \ exynos4210-origen.dtb \ exynos4210-smdkv310.dtb \ exynos4210-trats.dtb \ |
