From: Arnd Bergmann Date: Thu, 27 Mar 2014 00:54:39 +0000 (+0100) Subject: Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssant... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4de6732f88552e4f8fc504070ca4b840e7fe75f4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'keystone-dts-fixes' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/dt Merge "Keystone DTS fixes for 3.15" from Santosh Shilimkar: - Few fixes found during NAND ubifs testing - Fix to build all dtbs together with dtbs - Last patch is follow up comment from previous pull request * tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND ARM: dts: Build all keystone dt blobs ARM: dts: keystone: Fix control register range for clktsip ARM: dts: keystone: Fix domain register range for clkfftc1 Conflicts: arch/arm/boot/dts/Makefile Signed-off-by: Arnd Bergmann --- 4de6732f88552e4f8fc504070ca4b840e7fe75f4 diff --cc arch/arm/boot/dts/Makefile index 4780ca1c8885,49ff796dc02e..4bf43375eb90 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -78,9 -81,11 +78,12 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank ecx-2000.dtb dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ integratorcp.dtb + dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \ + k2l-evm.dtb \ + k2e-evm.dtb -dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb -dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ +kirkwood := \ + kirkwood-b3.dtb \ + kirkwood-cloudbox.dtb \ kirkwood-db-88f6281.dtb \ kirkwood-db-88f6282.dtb \ kirkwood-dns320.dtb \