summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-13 17:42:20 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-13 17:42:20 +0200
commit4dbacf2cdea7f372fddd576ff582634c8c2dc1f0 (patch)
treea4629c183aadab5e1ed86413687a50e2814ad257 /arch/arm/boot/dts/Makefile
parent971b4c6e1a827e2b01738772a2a7cfd8b0842286 (diff)
parentbb728d662bed0fe91b152550e640cb3f6caa972c (diff)
Merge tag 'imx-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree changes for 4.9" from Shawn Guo: - Add SoC support for i.MX7 Solo which is a reduced version of i.MX7 Dual. - New board support: Gateworks Ventana i.MX6Q/DL GW553x, Inverse Path i.MX53 USB armory, i.MX6Q/DL TS-4900 from Technologic Systems, i.MX6UL GEA M6UL modules from Engicam, i.MX7 Solo Warp7 board. - Add DMA and IPU CSI devices for i.MX53 SoC support. - Refine i.MX7 Dual SoC DTS as a preparation of i.MX7 Solo support. - Use of_graph dt nodes to describe the panel for vf610-colibri and ls1021a-twr boards. - Add gpio-ranges property to i.MX6 GPIO controllers, which will be useful when GPIO driver is changed to request pad configuration as GPIO function. - Random device additions or small changes for various board support. * tag 'imx-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (41 commits) ARM: dts: add gpio-ranges property to iMX GPIO controllers ARM: dts: imx35: add iim module to imx35.dtsi ARM: dts: vf610-colibri: use of_graph dt nodes to describe the panel ARM: dts: ls1021a: Add of_graph dt nodes to describe the panel ARM: dts: imx53: add support for USB armory board devicetree: Add vendor prefix for Inverse Path ARM: dts: imx7s-warp: Add Bluetooth support ARM: dts: imx7s-warp: Add User Button support ARM: dts: imx7s-warp: Enable I2C2 device support ARM: dts: imx6ul-geam: Add Engicam IMX6UL GEA M6UL initial support ARM: dts: imx6ul iomuxc syscon is compatible to imx6q ARM: dts: imx7-colibri: add Audio support ARM: dts: imx7-colibri: add basic supply regulators ARM: dts: imx7-colibri: move SD-card to module level ARM: dts: imx6sx: Add GPU bindings ARM: dts: imx7s-warp: Let the codec control MCLK pinctrl ARM: dts: imx6ul-pico-hobbit: Use WDOG_B pin reset ARM: dts: imx6q-bx50v3: configure unused pca953x pins ARM: dts: imx6sx: document SION necessity of ENET1_REF_CLK1 ARM: dts: imx7s-warp: Use WDOG_B pin reset ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e9d5c984db2c..ba1ec6c5678f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX53) += \
imx53-smd.dtb \
imx53-tx53-x03x.dtb \
imx53-tx53-x13x.dtb \
+ imx53-usbarmory.dtb \
imx53-voipac-bsb.dtb
dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-apf6dev.dtb \
@@ -330,6 +331,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-gw54xx.dtb \
imx6dl-gw551x.dtb \
imx6dl-gw552x.dtb \
+ imx6dl-gw553x.dtb \
imx6dl-hummingboard.dtb \
imx6dl-nit6xlite.dtb \
imx6dl-nitrogen6x.dtb \
@@ -339,6 +341,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-sabreauto.dtb \
imx6dl-sabrelite.dtb \
imx6dl-sabresd.dtb \
+ imx6dl-ts4900.dtb \
imx6dl-tx6dl-comtft.dtb \
imx6dl-tx6s-8034.dtb \
imx6dl-tx6s-8035.dtb \
@@ -368,6 +371,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-gw54xx.dtb \
imx6q-gw551x.dtb \
imx6q-gw552x.dtb \
+ imx6q-gw553x.dtb \
imx6q-h100.dtb \
imx6q-hummingboard.dtb \
imx6q-icore-rqs.dtb \
@@ -382,6 +386,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-sabresd.dtb \
imx6q-sbc6x.dtb \
imx6q-tbs2910.dtb \
+ imx6q-ts4900.dtb \
imx6q-tx6q-1010.dtb \
imx6q-tx6q-1010-comtft.dtb \
imx6q-tx6q-1020.dtb \
@@ -407,6 +412,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
+ imx6ul-geam-kit.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
@@ -417,7 +423,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \
imx7d-nitrogen7.dtb \
imx7d-sbc-imx7.dtb \
imx7d-sdb.dtb \
- imx7s-colibri-eval-v3.dtb
+ imx7s-colibri-eval-v3.dtb \
+ imx7s-warp.dtb
dtb-$(CONFIG_SOC_LS1021A) += \
ls1021a-qds.dtb \
ls1021a-twr.dtb