summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorLinus Walleij2013-10-02 15:42:59 +0200
committerLinus Walleij2013-10-02 16:17:04 +0200
commit01dc909fa1be6259cdbbc9fd6933df4fbe26ea5a (patch)
tree127ff043f438c8a899a43d5f95c9fe6a96b8a257 /arch/arm/boot/dts/Makefile
parentARM: ux500: split HREF UIB files (diff)
downloadkernel-qcow2-linux-01dc909fa1be6259cdbbc9fd6933df4fbe26ea5a.tar.gz
kernel-qcow2-linux-01dc909fa1be6259cdbbc9fd6933df4fbe26ea5a.tar.xz
kernel-qcow2-linux-01dc909fa1be6259cdbbc9fd6933df4fbe26ea5a.zip
ARM: ux500: split the HREF DTS files from two to four
As the device tree conversion did away with the ability to auto-detect the UIB (User Interface Board) version from attempting to read an I2C address, we now have to pass the knowledge of what UIB is mounted through the device tree. This gives rise to four possible board permutations: - HREF prior to v60, ST UIB (hrefprev60-stuib) - HREF prior to v60, TVK1281618 UIB (hrefprev60-tvk) - HREF v60 and later, ST UIB (href60plus-stuib) - HREF v60 and later, TVK1281618 UIB (hrefv60plus-tvk) Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index cc0f1fb61753..f1163a4c55d3 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -189,8 +189,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
- ste-hrefprev60.dtb \
- ste-hrefv60plus.dtb \
+ ste-hrefprev60-stuib.dtb \
+ ste-hrefprev60-tvk.dtb \
+ ste-hrefv60plus-stuib.dtb \
+ ste-hrefv60plus-tvk.dtb \
ste-ccu8540.dtb \
ste-ccu9540.dtb
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb