diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 22:21:21 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 22:21:22 +0100 |
commit | 968313378b31ac422b9b5fd642486113ed890976 (patch) | |
tree | cad49e51ea0661e884b28a3f94dd400ab5b68aba /arch/arm/boot/dts/Makefile | |
parent | 5e4b9a57bec2608d04daf47f6b6d4492631d82b4 (diff) | |
parent | 2d42fa311df749e847769a86748a8c2d20687973 (diff) | |
download | linux-968313378b31ac422b9b5fd642486113ed890976.tar.gz |
Merge tag 'imx-dt-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX arm DTS changes for 5.7:
- New support for i.MX6/7 based PICO devices and Toradex i.MX7 based
Aster boards.
- Add voltage monitor device node for vf610-zii boards.
- Improve UART pins macro defines for i.MX6SX SoC and switch related
boards to use the new names.
- Use generic node name for devices like GPT, KPP, CCM, WDOG, OCOTP and
IOMUXC in i.MX DTS files.
- Switch imx6ul-pico device tree to DRM bindings.
- Use SPDX-License-Identifier for all Toradex i.MX6/7 based boards.
- Add proper rgmii PHY description for imx6dl-riotboard and
imx6q-marsboard.
- Add capture-subsystem device support for i.MX51.
- Kill off "simple-panel" compatibles which has never been an accepted
as an upstream compatible string.
- Random device addition to various boards.
* tag 'imx-dt-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (55 commits)
ARM: dts: imx6q-marsboard: properly define rgmii PHY
ARM: dts: imx6dl-riotboard: properly define rgmii PHY
ARM: dts: imx51-zii-rdu1: set name prefix for TPA6130A2
ARM: dts: imx6: RDU2: assign video PLL as input to LDB
ARM: dts: vf: toradex: SPDX tags and copyright cleanup
ARM: dts: imx7: toradex: use SPDX-License-Identifier
ARM: dts: imx6: toradex: use SPDX-License-Identifier
ARM: dts: imx51: add capture-subsystem device
ARM: dts: imx: add nvmem property for cpu0
ARM: dts: imx6qdl: Add imx6qdl-pico support
ARM: dts: imx6ul-pico: Add support for the dwarf baseboard
ARM: dts: imx7d-pico: Add support for the nymph baseboard
ARM: dts: imx7d-pico: Add support for the dwarf baseboard
ARM: dts: imx23: introduce mmc0_sck_cfg
ARM: dts: imx25-pinfunc: add config for kpp rows 4 to 7
ARM: dts: imx: align name for crypto node and child nodes
ARM: dts: imx6qdl-gw5910: add CC1352 UART
ARM: dts: imx6qdl-sr-som-ti: indicate powering off wifi is safe
ARM: dts: imx6: phycore-som: add da9062 gpio support
ARM: dts: imx6: phycore-som: explicit disable pmic watchdog during suspend
...
Link: https://lore.kernel.org/r/20200318051918.32579-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 94bee1bbc27d..e8dd99201397 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -446,6 +446,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-nitrogen6x.dtb \ imx6dl-phytec-mira-rdk-nand.dtb \ imx6dl-phytec-pbab01.dtb \ + imx6dl-pico-dwarf.dtb \ + imx6dl-pico-hobbit.dtb \ + imx6dl-pico-nymph.dtb \ + imx6dl-pico-pi.dtb \ imx6dl-rex-basic.dtb \ imx6dl-riotboard.dtb \ imx6dl-sabreauto.dtb \ @@ -529,6 +533,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-phytec-mira-rdk-emmc.dtb \ imx6q-phytec-mira-rdk-nand.dtb \ imx6q-phytec-pbab01.dtb \ + imx6q-pico-dwarf.dtb \ + imx6q-pico-hobbit.dtb \ + imx6q-pico-nymph.dtb \ + imx6q-pico-pi.dtb \ imx6q-pistachio.dtb \ imx6q-rex-pro.dtb \ imx6q-sabreauto.dtb \ @@ -594,6 +602,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-kontron-n6310-s-43.dtb \ imx6ul-liteboard.dtb \ imx6ul-opos6uldev.dtb \ + imx6ul-pico-dwarf.dtb \ imx6ul-pico-hobbit.dtb \ imx6ul-pico-pi.dtb \ imx6ul-phytec-segin-ff-rdk-nand.dtb \ @@ -610,12 +619,16 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ulz-14x14-evk.dtb dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-cl-som-imx7.dtb \ + imx7d-colibri-aster.dtb \ + imx7d-colibri-emmc-aster.dtb \ imx7d-colibri-emmc-eval-v3.dtb \ imx7d-colibri-eval-v3.dtb \ imx7d-mba7.dtb \ imx7d-meerkat96.dtb \ imx7d-nitrogen7.dtb \ + imx7d-pico-dwarf.dtb \ imx7d-pico-hobbit.dtb \ + imx7d-pico-nymph.dtb \ imx7d-pico-pi.dtb \ imx7d-sbc-imx7.dtb \ imx7d-sdb.dtb \ @@ -623,6 +636,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-sdb-sht11.dtb \ imx7d-zii-rmu2.dtb \ imx7d-zii-rpu2.dtb \ + imx7s-colibri-aster.dtb \ imx7s-colibri-eval-v3.dtb \ imx7s-mba7.dtb \ imx7s-warp.dtb |