summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-11-18 09:59:57 -0800
committerOlof Johansson <olof@lixom.net>2016-11-18 09:59:57 -0800
commit1fc7210c1d053b70c898b59deecaedb3fbf8f767 (patch)
treec79e6e7ae7f35f4eb3652a61c81eb0c8e88a11e9 /arch/arm/boot/dts/Makefile
parentf05646c94b64adcc2ce3892b91ab7421ef1c690f (diff)
parentc201369d4aa5f05b8a37d6d1eeabf248c7086454 (diff)
Merge tag 'imx-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
i.MX device tree updates for 4.10: - New boards support: i.MX6SX UDOO Neo, Boundary Devices Nitrogen6_SOM2, Engicam i.CoreM6, Grinn i.MX6UL liteSOM/liteBoard, Toradex Colibri iMX6 module, i.MX6ULL and EVK board. - Remove skeleton.dtsi inclusion from all i.MX SoC dts files, as it's been deprecated, since commit 9c0da3cc61f1233c ("ARM: dts: explicitly mark skeleton.dtsi as deprecated"). - Misc device addition and enabling: OCOTP for Vybrid, MMDC for i.MX6QP, TMU for LS1021A, FEC for imx6qdl-icore, DMA for Vybrid DSPI. - A few cleanups: use hyphens for node names, fix white spaces, move imx-weim parameters into SoC dtsi, replace gpio-key,wakeup with wakeup-source, remove pwm-leds from imx6q-apalis-ixora, remove I2C3 from vf610-zii-dev-rev-b. - Other small random changes: calibrate USB PHY for b650v3 board, update TX D_CAL for USBPHY, use enable-gpios for backlight on imx6qdl-apalis, etc. * tag 'imx-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (38 commits) ARM: dts: imx6ull: add imx6ull support ARM: dts: imx6q: replace gpio-key,wakeup with wakeup-source for Utilite Pro ARM: dts: vfxxx: Enable DMA for DSPI2 and DSPI3 ARM: dts: imx: Remove skeleton.dtsi ARM: dts: imx6q-utilite-pro: i2c1 is muxed ARM: dts: add new compatible string for i.MX6QP mmdc ARM: dts: imx6sx-udoo: Add board specific compatible strings ARM: dts: mx5: Add new M53EVK manufacturer compat ARM: dts: mxs: Add new M28EVK manufacturer compat ARM: dts: imx6ul-14x14-evk: update TX D_CAL for USBPHY ARM: dts: imx6sx-sdb: update TX D_CAL for USBPHY ARM: dts: imx6: Add imx-weim parameters to dtsi's ARM: dts: imx: Fix "ERROR: code indent should use tabs where possible" ARM: dts: imx6qdl-nitrogen6_max: use hyphens for nodes name ARM: dts: imx6qdl-nit6xlite: use hyphens for nodes name ARM: dts: imx6qdl-nitrogen6x: use hyphens for nodes name ARM: dts: imx6qdl-sabrelite: use hyphens for nodes name ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support ARM: dts: imx6qdl-icore: Add FEC support ARM: dts: imx6q: Add Engicam i.CoreM6 DualLite/Solo initial support ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7ef420372b59..01d0ee2964aa 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -331,6 +331,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-aristainetos_7.dtb \
imx6dl-aristainetos2_4.dtb \
imx6dl-aristainetos2_7.dtb \
+ imx6dl-colibri-eval-v3.dtb \
imx6dl-cubox-i.dtb \
imx6dl-dfi-fs700-m60.dtb \
imx6dl-gw51xx.dtb \
@@ -341,6 +342,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-gw552x.dtb \
imx6dl-gw553x.dtb \
imx6dl-hummingboard.dtb \
+ imx6dl-icore.dtb \
imx6dl-nit6xlite.dtb \
imx6dl-nitrogen6x.dtb \
imx6dl-phytec-pbab01.dtb \
@@ -382,10 +384,12 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-gw553x.dtb \
imx6q-h100.dtb \
imx6q-hummingboard.dtb \
+ imx6q-icore.dtb \
imx6q-icore-rqs.dtb \
imx6q-marsboard.dtb \
imx6q-nitrogen6x.dtb \
imx6q-nitrogen6_max.dtb \
+ imx6q-nitrogen6_som2.dtb \
imx6q-novena.dtb \
imx6q-phytec-pbab01.dtb \
imx6q-rex-pro.dtb \
@@ -417,14 +421,19 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sabreauto.dtb \
imx6sx-sdb-reva.dtb \
imx6sx-sdb-sai.dtb \
- imx6sx-sdb.dtb
+ imx6sx-sdb.dtb \
+ imx6sx-udoo-neo-basic.dtb \
+ imx6sx-udoo-neo-extended.dtb \
+ imx6sx-udoo-neo-full.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
imx6ul-geam-kit.dtb \
+ imx6ul-liteboard.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
- imx6ul-tx6ul-mainboard.dtb
+ imx6ul-tx6ul-mainboard.dtb \
+ imx6ull-14x14-evk.dtb
dtb-$(CONFIG_SOC_IMX7D) += \
imx7d-cl-som-imx7.dtb \
imx7d-colibri-eval-v3.dtb \