diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-27 00:46:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-27 00:46:39 +0300 |
| commit | 8be31869ee92d0d081400d8b8feba92ee4bd20de (patch) | |
| tree | 7be04c290209fd6d614514f073d028da62d581b2 /arch/arm/boot/dts/Makefile | |
| parent | 0314df7752735149f92c40db14036c844e2c5ce4 (diff) | |
| parent | 5b7551db86884c54bf1d2e2a943d4ec3f5463da8 (diff) | |
| download | linux-8be31869ee92d0d081400d8b8feba92ee4bd20de.tar.xz | |
Merge tag 'keystone_dts_for_4.6_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
Merge "ARM: Keystone DTS for 4.6" from Santosh Shilimkar:
ARM: DTS: Add new bindings for K2G and the K2G evm
K2G SoC family is the newest version of the Keystone family of processors.
The technical reference manual for K2G can be found here:
http://www.ti.com/lit/ug/spruhy8/spruhy8.pdf
* tag 'keystone_dts_for_4.6_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: dts: keystone: Add minimum support for K2G evm
ARM: dts: keystone: Add Initial DT support for TI K2G SoC family
ARM: keystone: Create new binding for K2G SoC
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 bac6e170209d..cf7abe8e7087 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -158,7 +158,8 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += \ dtb-$(CONFIG_ARCH_KEYSTONE) += \ k2hk-evm.dtb \ k2l-evm.dtb \ - k2e-evm.dtb + k2e-evm.dtb \ + keystone-k2g-evm.dtb dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-b3.dtb \ kirkwood-blackarmor-nas220.dtb \ |