diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-24 23:36:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-24 23:36:10 +0200 |
| commit | 412252ac8c1fef358286d219faa51cb8607adb98 (patch) | |
| tree | 2598c005e3f2dcdfdc5c6c99e9366da00e018b2b /arch/arm/boot/dts/Makefile | |
| parent | a5cc8c3a715caa17e5da7ca795ae38919a5b68a3 (diff) | |
| parent | 880e1509db9732d5696d2a092e9bd61d80ad00be (diff) | |
| download | talos-obmc-linux-412252ac8c1fef358286d219faa51cb8607adb98.tar.gz talos-obmc-linux-412252ac8c1fef358286d219faa51cb8607adb98.zip | |
Merge tag 'imx-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Merge "The i.MX device tree updates for 4.7" from Shawn Guo:
- More i.MX6 System-on-Module board support from Ka-Ro electronics:
tx6s-8xxx, tx6u-8xxx, tx6q-1xxx, tx6ul-00xx.
- Nitrogen6_MAX QP and Nitrogen6_SoloX board support from Boundary
Devices.
- VF610 based ZII development board support.
- Add SAI interface audio support for i.MX6SX SDB board.
- A number of random updates on LS1021A and VF610 dts files.
- A couple of pinumx updates on i.MX25 and i.MX28.
* tag 'imx-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (36 commits)
ARM: dts: imx6qdl-udoo: add 7 inch LCD touchscreen panel support
ARM: dts: i.MX3x: add keypad port devicetree nodes
ARM: dts: ls1021a: add pix clock to DCU dts node
ARM: dts: ls1021a: DSPI has 6 chip-selects
ARM: dts: ls1021a: Add gpio support for ls1021a platform
ARM: dts: imx6q-ba16: Remove unused vqmmc-supply
ARM: dts: ls1021a: add SCFG MSI dts node
ARM: dts: imx28: add alternative pinmuxing for mac0
ARM: dts: imx6q-tbs2910: fix fec reset polarity
ARM: dts: vf610-zii-dev: Add ZII development board.
ARM: dts: vfxxx: add missing reg properties
ARM: dts: vf-colibri: increase NAND clock speed
ARM: dts: vf-colibri: alias the primary FEC as ethernet0
ARM: dts: imx6sx-sdb: Add SAI support
bindings: fsl-imx-sdma: Document 'fsl,sdma-event-remap' property
ARM: dts: imx6sx: Remove unused property
ARM: dts: imx6sx: Fix SAI DMA index
ARM: dts: imx6q-ba16: Disable pwm2 by default
ARM: dts: imx: add Boundary Devices Nitrogen6_SoloX board
ARM: dts: imx6qdl-sabresd: Pass the hannstar panel compatible string
...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index bf7fae4dbae2..a2bb8324cae3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -324,8 +324,12 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ imx6dl-tx6dl-comtft.dtb \ + imx6dl-tx6s-8034.dtb \ + imx6dl-tx6s-8035.dtb \ imx6dl-tx6u-801x.dtb \ + imx6dl-tx6u-8033.dtb \ imx6dl-tx6u-811x.dtb \ + imx6dl-tx6u-81xx-mb7.dtb \ imx6dl-udoo.dtb \ imx6dl-wandboard.dtb \ imx6dl-wandboard-revb1.dtb \ @@ -364,21 +368,29 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-tx6q-1010-comtft.dtb \ imx6q-tx6q-1020.dtb \ imx6q-tx6q-1020-comtft.dtb \ + imx6q-tx6q-1036.dtb \ imx6q-tx6q-1110.dtb \ + imx6q-tx6q-11x0-mb7.dtb \ imx6q-udoo.dtb \ imx6q-wandboard.dtb \ imx6q-wandboard-revb1.dtb \ + imx6qp-nitrogen6_max.dtb \ imx6qp-sabreauto.dtb \ imx6qp-sabresd.dtb dtb-$(CONFIG_SOC_IMX6SL) += \ imx6sl-evk.dtb \ imx6sl-warp.dtb dtb-$(CONFIG_SOC_IMX6SX) += \ + imx6sx-nitrogen6sx.dtb \ imx6sx-sabreauto.dtb \ imx6sx-sdb-reva.dtb \ + imx6sx-sdb-sai.dtb \ imx6sx-sdb.dtb dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ul-14x14-evk.dtb + imx6ul-14x14-evk.dtb \ + imx6ul-tx6ul-0010.dtb \ + imx6ul-tx6ul-0011.dtb \ + imx6ul-tx6ul-mainboard.dtb dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-cl-som-imx7.dtb \ imx7d-sbc-imx7.dtb \ @@ -392,7 +404,8 @@ dtb-$(CONFIG_SOC_VF610) += \ vf610m4-colibri.dtb \ vf610-cosmic.dtb \ vf610m4-cosmic.dtb \ - vf610-twr.dtb + vf610-twr.dtb \ + vf610-zii-dev-rev-b.dtb dtb-$(CONFIG_ARCH_MXS) += \ imx23-evk.dtb \ imx23-olinuxino.dtb \ |
