diff options
author | Olof Johansson <olof@lixom.net> | 2017-06-19 05:14:52 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-06-19 05:14:52 +0300 |
commit | 3a1fc4d2044e136974af61bbe292c4a1a3cc73d6 (patch) | |
tree | 5a1572fbd6bd794f90a6250208dfbf67921e1911 /arch/arm/boot/dts/Makefile | |
parent | c3e81b9dd52db3cfd431db317e4fe8284b36889a (diff) | |
parent | 84e00e244176baec37c66b1cbee6b8a2f7dbd76f (diff) | |
download | linux-3a1fc4d2044e136974af61bbe292c4a1a3cc73d6.tar.xz |
Merge tag 'keystone_dts_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
ARM: dts: Keystone K2G ICE EVM support for v4.13
* tag 'keystone_dts_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: dts: keystone: Add minimum support for K2G ICE evm
ARM: keystone: Create new binding for K2G ICE evm
ARM: dts: k2g-evm: Add unit address to memory node
ARM: dts: keystone-k2g: Remove skeleton.dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
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 7209ab22cbf3..741bc8e0eab2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -204,7 +204,8 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ keystone-k2hk-evm.dtb \ keystone-k2l-evm.dtb \ keystone-k2e-evm.dtb \ - keystone-k2g-evm.dtb + keystone-k2g-evm.dtb \ + keystone-k2g-ice.dtb dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-b3.dtb \ kirkwood-blackarmor-nas220.dtb \ |