summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-29 21:07:40 -0800
committerOlof Johansson <olof@lixom.net>2017-01-29 21:07:40 -0800
commitc3fcab3af4a35959af175f421b758bc2f328fa79 (patch)
tree6f6d691c5d5a74cc569ee326a3a32a5ce0015751 /arch/arm/boot/dts/Makefile
parent0ff3758bc349e8675b859f314e8a65457e22d3ab (diff)
parent18ba386826f143dc4177830cc7c24c7abf4de4be (diff)
Merge tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
i.MX device tree updates for 4.11: - New board support: vf610-zii-dev-rev-c, imx6ul-opos6uldev, imx6ul-isiot, imx6qdl-savageboard, imx6q-mccmon6. - A patch from Alexandre to correct the mangled license text which has been copied & pasted all over the i.MX device tree files. - Update cpu nodes of some i.MX SoCs to make them consistent and match ePAPR spec. - Add OCOTP device for i.MX6UL SoC. - Add security violation interrupt for i.MX25 DryIce. - Enable USB OTG, WIFI and Bluetooth support for i.MX6SX Udoo Neo board. - Enable S/PDIF and 2nd display pipeline support for CompuLab board.. - Add SPI and LTC3676 PMIC support for Gateworks Ventana boards. - A few random device addition for various boards: TVE DAC regulators for imx53-qsb, EEPROM for vf610-zii-dev, eMMC and NAND support for i.MX6UL Engicam boards. - Cleanups on obsoleted or unused properties. * tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (32 commits) ARM: dts: udoo_neo: Add Bluetooth support ARM: dts: udoo_neo: Add Wifi support ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL NAND initial support ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL eMMC initial support ARM: dts: imx6qdl: Fix "ERROR: code indent should use tabs where possible" ARM: dts: vf610-zii-dev: add EEPROM entry to Rev C ARM: dts: add Armadeus Systems OPOS6UL and OPOS6ULDEV support ARM: dts: imx6q-utilite-pro: enable 2nd display pipeline ARM: dts: vf610-zii-dev: Add .dts file for rev. C ARM: dts: vf610-zii-dev-rev-b: Remove leftover PWM pingroup ARM: dts: imx6: Support Savageboard quad ARM: dts: imx6: Support Savageboard dual ARM: dts: imx6: Add Savageboard common file ARM: dts: imx53-qsb: Provide the TVE DAC regulators ARM: dts: imx6q: Add mccmon6 board support Doc: devicetree: bindings: Add vendor prefix entry - lwn ARM: dts: imx/vf: Correct license text ARM: dts: imx25.dtsi: DryIce security violation interrupt ARM: dts: imx: Add ocotp node for imx6ul ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c0d10e4b2ca8..7c743c53f3ff 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -354,6 +354,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-gw553x.dtb \
imx6dl-hummingboard.dtb \
imx6dl-icore.dtb \
+ imx6dl-icore-rqs.dtb \
imx6dl-nit6xlite.dtb \
imx6dl-nitrogen6x.dtb \
imx6dl-phytec-pbab01.dtb \
@@ -362,6 +363,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-sabreauto.dtb \
imx6dl-sabrelite.dtb \
imx6dl-sabresd.dtb \
+ imx6dl-savageboard.dtb \
imx6dl-ts4900.dtb \
imx6dl-tx6dl-comtft.dtb \
imx6dl-tx6s-8034.dtb \
@@ -398,6 +400,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-icore.dtb \
imx6q-icore-rqs.dtb \
imx6q-marsboard.dtb \
+ imx6q-mccmon6.dtb \
imx6q-nitrogen6x.dtb \
imx6q-nitrogen6_max.dtb \
imx6q-nitrogen6_som2.dtb \
@@ -407,6 +410,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-sabreauto.dtb \
imx6q-sabrelite.dtb \
imx6q-sabresd.dtb \
+ imx6q-savageboard.dtb \
imx6q-sbc6x.dtb \
imx6q-tbs2910.dtb \
imx6q-ts4900.dtb \
@@ -439,7 +443,10 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
imx6ul-geam-kit.dtb \
+ imx6ul-isiot-emmc.dtb \
+ imx6ul-isiot-nand.dtb \
imx6ul-liteboard.dtb \
+ imx6ul-opos6uldev.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
@@ -463,7 +470,8 @@ dtb-$(CONFIG_SOC_VF610) += \
vf610-cosmic.dtb \
vf610m4-cosmic.dtb \
vf610-twr.dtb \
- vf610-zii-dev-rev-b.dtb
+ vf610-zii-dev-rev-b.dtb \
+ vf610-zii-dev-rev-c.dtb
dtb-$(CONFIG_ARCH_MXS) += \
imx23-evk.dtb \
imx23-olinuxino.dtb \