summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-28 12:51:23 -0700
committerOlof Johansson <olof@lixom.net>2019-04-28 12:51:23 -0700
commitbe058ba65d9e43f40d31d9b16b99627f0a20de1b (patch)
tree42c5f9c1fe786bfc086350f35a73dec2ac4b7d12 /arch/arm/boot/dts/Makefile
parentb45da609a02460c6a34c395f03f891f1fb2a021a (diff)
parent4171797ff78fa1f351b890e18411b7959b506149 (diff)
Merge tag 'imx-dt-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX arm device tree update for 5.2: - New board support: imx50-kobo-aura, imx53-m53menlo, imx6dl-eckelmann, imx7d-mba7, imx7d-zii-rpu2, and vf610-zii-spb4. - Add i2c, mmc and spi aliases for SoC i.MX35, i.MX50 and i.MX6SL. - Use new 'reset-gpios' property describing CODEC reset pin for board mx6qdl-zii-rdu2, imx6qdl-gw5903 and imx6qdl-var-dart. - Specify viewport count for PCIE block on SoC imx7d and imx6qdl. - Correct 'ipg' clock of SDMA device for i.MX5, i.MX6 and i.MX7 SoCs. - Rename MMDC memory controller device to be generic and add MMDC device for imx7ulp SoC. - Add OCOTP device support for imx7ulp SoC. - Improve ZII board DTS by switching to SPDX identifier and using generic device node name. - A series from Rui Miguel Silva to add various media related devices for i.MX7 SoC, and enable ov2680 sensor support for imx7s-warp board. - Random small updates on various board support. * tag 'imx-dt-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (59 commits) ARM: dts: imx7s: Specify #io-channel-cells in ADC nodes ARM: dts: vf610-zii-dev-rev-b: Specify CS as GPIO_ACTIVE_LOW in spi0 ARM: dts: vf610-zii-dev: Mark i2c0 SCL as GPIO_OPEN_DRAIN ARM: dts: Add support for ZII i.MX7 RPU2 board ARM: dts: bugfix tqma7 soft reset issue ARM: dts: imx53: Add Menlosystems M53 board ARM: dts: imx53: Rename M53 SoM touchscreen node ARM: dts: imx6dl-sabreauto: update opp table for auto part ARM: dts: imx: Use generic node names for Zii dts ARM: dts: imx: Switch Zii dts to SPDX identifier ARM: dts: imx6q-logicpd: Shutdown LCD regulator during suspend ARM: dts: imx6q-logicpd: Enable Analog audio capture ARM: dts: imx6sll: add cooling-cells for cpu-freq cooling device ARM: dts: imx50: Add Kobo Aura DTS ARM: dts: imx6qdl-var-dart: Use new CODEC reset pin name ARM: dts: imx6qdl-gw5903: Use new CODEC reset pin name ARM: dts: mx6qdl-zii-rdu2: Use new CODEC reset pin name ARM: dts: imx50: Specify IMX5_CLK_IPG as "ahb" clock to SDMA ARM: dts: imx51: Specify IMX5_CLK_IPG as "ahb" clock to SDMA ARM: dts: imx53: Specify IMX5_CLK_IPG as "ahb" clock to SDMA ... Signed-off-by: Olof Johansson <olof@lixom.net>
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 c7fa55560b44..81c21f75c1e6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -363,7 +363,8 @@ dtb-$(CONFIG_SOC_IMX35) += \
imx35-eukrea-mbimxsd35-baseboard.dtb \
imx35-pdk.dtb
dtb-$(CONFIG_SOC_IMX50) += \
- imx50-evk.dtb
+ imx50-evk.dtb \
+ imx50-kobo-aura.dtb
dtb-$(CONFIG_SOC_IMX51) += \
imx51-apf51.dtb \
imx51-apf51dev.dtb \
@@ -380,6 +381,7 @@ dtb-$(CONFIG_SOC_IMX53) += \
imx53-kp-ddc.dtb \
imx53-kp-hsc.dtb \
imx53-m53evk.dtb \
+ imx53-m53menlo.dtb \
imx53-mba53.dtb \
imx53-ppd.dtb \
imx53-qsb.dtb \
@@ -400,6 +402,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-cubox-i-emmc-som-v15.dtb \
imx6dl-cubox-i-som-v15.dtb \
imx6dl-dfi-fs700-m60.dtb \
+ imx6dl-eckelmann-ci4x10.dtb \
imx6dl-emcon-avari.dtb \
imx6dl-gw51xx.dtb \
imx6dl-gw52xx.dtb \
@@ -579,6 +582,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \
imx7d-cl-som-imx7.dtb \
imx7d-colibri-emmc-eval-v3.dtb \
imx7d-colibri-eval-v3.dtb \
+ imx7d-mba7.dtb \
imx7d-nitrogen7.dtb \
imx7d-pico-hobbit.dtb \
imx7d-pico-pi.dtb \
@@ -586,7 +590,9 @@ dtb-$(CONFIG_SOC_IMX7D) += \
imx7d-sdb.dtb \
imx7d-sdb-reva.dtb \
imx7d-sdb-sht11.dtb \
+ imx7d-zii-rpu2.dtb \
imx7s-colibri-eval-v3.dtb \
+ imx7s-mba7.dtb \
imx7s-warp.dtb
dtb-$(CONFIG_SOC_IMX7ULP) += \
imx7ulp-evk.dtb
@@ -606,6 +612,7 @@ dtb-$(CONFIG_SOC_VF610) += \
vf610-zii-dev-rev-b.dtb \
vf610-zii-dev-rev-c.dtb \
vf610-zii-scu4-aib.dtb \
+ vf610-zii-spb4.dtb \
vf610-zii-ssmb-dtu.dtb \
vf610-zii-ssmb-spu3.dtb
dtb-$(CONFIG_ARCH_MXS) += \