diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 01:54:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 01:54:39 +0100 |
| commit | 4de6732f88552e4f8fc504070ca4b840e7fe75f4 (patch) | |
| tree | d399f5e78a6cb53e55239447218008b9a4d7e24e /arch/arm/boot/dts/Makefile | |
| parent | ARM: tegra: fix Dalmore pinctrl configuration (diff) | |
| parent | ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm (diff) | |
| download | linux-4de6732f88552e4f8fc504070ca4b840e7fe75f4.tar.xz linux-4de6732f88552e4f8fc504070ca4b840e7fe75f4.zip | |
Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4780ca1c8885..4bf43375eb90 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -78,6 +78,9 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ ecx-2000.dtb dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ integratorcp.dtb +dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \ + k2l-evm.dtb \ + k2e-evm.dtb kirkwood := \ kirkwood-b3.dtb \ kirkwood-cloudbox.dtb \ |