diff options
author | Olof Johansson <olof@lixom.net> | 2015-01-23 13:48:57 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-23 13:48:57 -0800 |
commit | 362c9a778c8597d96d469123b0bf738e8479bcb1 (patch) | |
tree | 0d235a98e1e23bbb55aa80367c6f708feb80ba33 /arch/arm/boot/dts/Makefile | |
parent | 0786d9c5b37bdff216fd14b4ef07641638c0f3cb (diff) | |
parent | 1f43c45df7afb706470f7d81d983dd7763a9452f (diff) |
Merge tag 'omap-for-v3.20/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap device tree changes for v3.20, part 2" from Tony Lindgren:
More changes for omap dts files mostly to add support for
dm816x devices and clocks. Also adds a qspi device for
dra72x-evm.
* tag 'omap-for-v3.20/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: dra72-evm: Add qspi device
ARM: dts: Add minimal support for dm8168-evm
ARM: dts: Add basic clocks for dm816x
ARM: dts: Add basic dm816x device tree configuration
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 89bb76298d90..17ee818d6583 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -393,6 +393,8 @@ dtb-$(CONFIG_ARCH_OMAP3) += \ omap3-sbc-t3730.dtb \ omap3-thunder.dtb \ omap3-zoom3.dtb +dtb-$(CONFIG_SOC_TI81XX) += \ + dm8168-evm.dtb dtb-$(CONFIG_SOC_AM33XX) += \ am335x-base0033.dtb \ am335x-bone.dtb \ |