diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:00:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:00:27 +0200 |
| commit | 3d12971ebd5c48f4d1d80ac993bf82af7545c239 (patch) | |
| tree | d9374f07425f1f30e0419b20f151b9d8de4cd030 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'arm-soc/for-4.14/devicetree' of http://github.com/Broadcom/stblinu... (diff) | |
| parent | ARM: dts: imx6q-bx50v3: Enable i2c recovery mechanism (diff) | |
| download | linux-3d12971ebd5c48f4d1d80ac993bf82af7545c239.tar.xz linux-3d12971ebd5c48f4d1d80ac993bf82af7545c239.zip | |
Merge tag 'imx-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree updates for 4.14" from Shawn Guo:
- A series from Andrew Lunn updating imx6-rdu2 board to enable
on-board Marvell switch support.
- A series from Jagan Teki updating imx6ul-isiot and imx6ul-geam to
enable audio card and FEC support.
- Add support for Toradex Ixora V1.1 and Apalis Evaluation Board
along with some cleanups.
- Enable DRM display support for imx6ul-evk and imx7d-sdb board.
- Add i.MX53 based Beckhoff CX9020 board support.
- Add GPMI NAND and APBH DMA devices for i.MX7 and enables NAND support
for imx7-colibri board.
- Enables the ADV7180 analog video decoder sensor connected to the
IMX6 IPU on various Gateworks Ventana boards.
- Minor updates on misc boards and some random cleanups.
* tag 'imx-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (47 commits)
ARM: dts: imx6q-bx50v3: Enable i2c recovery mechanism
ARM: dts: imx6q-apalis-eval: add support for Apalis Evaluation Board
ARM: dts: imx6: add support for Toradex Ixora V1.1 carrier board
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi
ARM: dts: imx6q-apalis-ixora: add camera i2c bus definition
ARM: dts: imx6q-apalis-ixora: get rid of obsolete fusion comment
ARM: dts: imx6qdl-apalis: reword cam i2c comment
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: get rid of tegra legacy gen1_i2c comment
ARM: dts: imx6q-apalis-ixora: combine aliases
ARM: dts: imx6qdl-apalis: split usdhc1 pinctrl to support 4- and 8-bit
ARM: dts: imx6q-apalis-ixora: fix usdhc2 pinctrl property
ARM: dts: imx6ul-liteboard: Support poweroff
ARM: dts: imx: add CX9020 Embedded PC device tree
ARM: dts: imx53: add alternative UART2 configuration
ARM: dts: imx53: add srtc node
dt-bindings: arm: Add entry for Beckhoff CX9020
ARM: dts: i.MX25: add RNGB node to dtsi
ARM: dts: imx6ul-14x14-evk: Remove unrelated pin from ENET group
ARM: dts: imx7d-sdb: Add flexcan support
ARM: dts: imx7-colibri: add NAND support
...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7cabe8344e4f..bbac09ae798e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -343,6 +343,7 @@ dtb-$(CONFIG_SOC_IMX51) += \ imx51-ts4800.dtb dtb-$(CONFIG_SOC_IMX53) += \ imx53-ard.dtb \ + imx53-cx9020.dtb \ imx53-m53evk.dtb \ imx53-mba53.dtb \ imx53-qsb.dtb \ @@ -394,7 +395,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-udoo.dtb \ imx6dl-wandboard.dtb \ imx6dl-wandboard-revb1.dtb \ + imx6q-apalis-eval.dtb \ imx6q-apalis-ixora.dtb \ + imx6q-apalis-ixora-v1.1.dtb \ imx6q-apf6dev.dtb \ imx6q-arm2.dtb \ imx6q-b450v3.dtb \ @@ -469,7 +472,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ imx6sx-udoo-neo-full.dtb dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-14x14-evk.dtb \ - imx6ul-geam-kit.dtb \ + imx6ul-geam.dtb \ imx6ul-isiot-emmc.dtb \ imx6ul-isiot-nand.dtb \ imx6ul-liteboard.dtb \ |