diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 23:58:19 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 23:58:19 +0100 |
commit | aa66be3bff6593bc74c5e09875709cd66e571b27 (patch) | |
tree | fabadc717e03d0871f50e6c6b9e526b903628fb6 /arch/arm/boot/dts/Makefile | |
parent | 3eaac3aed2e3aff29198a6058069fa7712d13e60 (diff) | |
parent | 327106e4217b8ef4f74640d7de15a0a287690aba (diff) |
Merge tag 'imx-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX device tree update for 5.11:
- New board support: imx6dl-alti6p, imx6dl-lanmcu, mx6qp-prtwd3,
imx6ul-phytec-segin and imx7d-flex-concentrator.
- Fix schema warnings for pwm-leds, watchdog and GPIO hog devices.
- A few patches from Krzysztof Kozlowski to correct compatibles for
i.MX6/7 boards.
- A series from Matthias Schiffer to polish imx7-mba7 board support.
- Update i.MX6/7 device trees for fsl,stop-mode support.
- Correct fsl,rcpm-wakeup of LS1021A to get flextimer wake-up work.
- A series of patch from Stefan Riedmueller to update phytec and segin
devices.
- Other small and random changes.
* tag 'imx-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (40 commits)
ARM: dts: imx28: Fix label name for L2 switch
ARM: dts: add Protonic WD3 board
ARM: dts: imx6qdl-kontron-samx6i: increase i2c-frequency
ARM: dts: imx7: add support for kamstrup flex concentrator
ARM: dts: ls1021a: update calibration table for TMU module
ARM: dts: ls1021a: fix rcpm failed to claim resource
ARM: dts: ls1021a: fix flextimer failed to wake system
ARM: dts: imx50-kobo-aura: Enable eKTF2132 touchscreen
ARM: dts: imx: Change flexcan node name to "can"
ARM: dts: imx6q-pico: fix board compatibles
ARM: dts: add Van der Laan LANMCU board
ARM: dts: add Altesco I6P board
ARM: dts: imx6ul: segin: peb-av-02: Mark stmpe touch as wakeup-source
ARM: dts: imx6ul: phytec: Add support for optional PEB-AV-02 LCD adapter
ARM: dts: imx6ul: segin: Add phyBOARD-Segin with eMMC phyCORE-i.MX6UL
ARM: dts: imx50-kobo-aura: Add 'grp' suffix to pinctrl node names
ARM: dts: imx: add usb alias
ARM: dts: imx6/7: sync fsl,stop-mode with current flexcan driver
ARM: dts: imx: Fix schema warnings for pwm-leds
ARM: dts: imx7s-warp: correct vendor in compatible to Element14
...
Link: https://lore.kernel.org/r/20201202142717.9262-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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 28f16b6eb3ea..ef2be2390c75 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -418,6 +418,7 @@ dtb-$(CONFIG_SOC_IMX53) += \ imx53-usbarmory.dtb \ imx53-voipac-bsb.dtb dtb-$(CONFIG_SOC_IMX6Q) += \ + imx6dl-alti6p.dtb \ imx6dl-apf6dev.dtb \ imx6dl-aristainetos_4.dtb \ imx6dl-aristainetos_7.dtb \ @@ -454,6 +455,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-icore.dtb \ imx6dl-icore-mipi.dtb \ imx6dl-icore-rqs.dtb \ + imx6dl-lanmcu.dtb \ imx6dl-mamoj.dtb \ imx6dl-nit6xlite.dtb \ imx6dl-nitrogen6x.dtb \ @@ -585,6 +587,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6qp-nitrogen6_max.dtb \ imx6qp-nitrogen6_som2.dtb \ imx6qp-phytec-mira-rdk-nand.dtb \ + imx6qp-prtwd3.dtb \ imx6qp-sabreauto.dtb \ imx6qp-sabresd.dtb \ imx6qp-tx6qp-8037.dtb \ @@ -626,6 +629,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-pico-dwarf.dtb \ imx6ul-pico-hobbit.dtb \ imx6ul-pico-pi.dtb \ + imx6ul-phytec-segin-ff-rdk-emmc.dtb \ imx6ul-phytec-segin-ff-rdk-nand.dtb \ imx6ul-tx6ul-0010.dtb \ imx6ul-tx6ul-0011.dtb \ @@ -645,6 +649,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-colibri-emmc-aster.dtb \ imx7d-colibri-emmc-eval-v3.dtb \ imx7d-colibri-eval-v3.dtb \ + imx7d-flex-concentrator.dtb \ + imx7d-flex-concentrator-mfg.dtb \ imx7d-mba7.dtb \ imx7d-meerkat96.dtb \ imx7d-nitrogen7.dtb \ |