Merge tag 'imx-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Tue, 8 Dec 2020 22:58:19 +0000 (23:58 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 8 Dec 2020 22:58:19 +0000 (23:58 +0100)
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>
1  2 
arch/arm/boot/dts/Makefile

@@@ -197,7 -197,6 +197,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS4) += 
        exynos4412-odroidx.dtb \
        exynos4412-odroidx2.dtb \
        exynos4412-origen.dtb \
 +      exynos4412-p4note-n8010.dtb \
        exynos4412-smdk4412.dtb \
        exynos4412-tiny4412.dtb \
        exynos4412-trats2.dtb
@@@ -340,10 -339,7 +340,10 @@@ dtb-$(CONFIG_ARCH_LPC32XX) += 
        lpc3250-ea3250.dtb \
        lpc3250-phy3250.dtb
  dtb-$(CONFIG_ARCH_NPCM7XX) += \
 -      nuvoton-npcm750-evb.dtb
 +      nuvoton-npcm730-gsj.dtb \
 +      nuvoton-npcm730-kudo.dtb \
 +      nuvoton-npcm750-evb.dtb \
 +      nuvoton-npcm750-runbmc-olympus.dtb
  dtb-$(CONFIG_MACH_MESON6) += \
        meson6-atv1200.dtb
  dtb-$(CONFIG_MACH_MESON8) += \
@@@ -418,6 -414,7 +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 \
        imx6dl-icore.dtb \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
+       imx6dl-lanmcu.dtb \
        imx6dl-mamoj.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
        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 -625,7 +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 -645,8 +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 \
@@@ -1070,7 -1072,6 +1076,7 @@@ dtb-$(CONFIG_ARCH_STM32) += 
        stm32mp157a-iot-box.dtb \
        stm32mp157a-stinger96.dtb \
        stm32mp157c-dhcom-pdk2.dtb \
 +      stm32mp157c-dhcom-picoitx.dtb \
        stm32mp157c-dk2.dtb \
        stm32mp157c-ed1.dtb \
        stm32mp157c-ev1.dtb \
@@@ -1197,7 -1198,6 +1203,7 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-h3-nanopi-m1-plus.dtb \
        sun8i-h3-nanopi-neo.dtb \
        sun8i-h3-nanopi-neo-air.dtb \
 +      sun8i-h3-nanopi-r1.dtb \
        sun8i-h3-orangepi-2.dtb \
        sun8i-h3-orangepi-lite.dtb \
        sun8i-h3-orangepi-one.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
        sun8i-h3-orangepi-zero-plus2.dtb \
        sun8i-h3-rervision-dvk.dtb \
 +      sun8i-h3-zeropi.dtb \
        sun8i-h3-emlid-neutis-n5h3-devboard.dtb \
        sun8i-r16-bananapi-m2m.dtb \
        sun8i-r16-nintendo-nes-classic.dtb \
        sun8i-r16-nintendo-super-nes-classic.dtb \
        sun8i-r16-parrot.dtb \
        sun8i-r40-bananapi-m2-ultra.dtb \
 +      sun8i-s3-elimo-initium.dtb \
        sun8i-s3-lichee-zero-plus.dtb \
        sun8i-s3-pinecube.dtb \
        sun8i-t3-cqa3t-bv3.dtb \
@@@ -1249,8 -1247,7 +1255,8 @@@ dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += 
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
 -      tegra30-colibri-eval-v3.dtb
 +      tegra30-colibri-eval-v3.dtb \
 +      tegra30-ouya.dtb
  dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
        tegra114-dalmore.dtb \
        tegra114-roth.dtb \
@@@ -1328,7 -1325,6 +1334,7 @@@ dtb-$(CONFIG_MACH_ARMADA_370) += 
  dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
 +      armada-382-rd-ac3x-48g4x2xl.dtb \
        armada-385-clearfog-gtr-s4.dtb \
        armada-385-clearfog-gtr-l8.dtb \
        armada-385-db-88f6820-amc.dtb \
@@@ -1350,12 -1346,6 +1356,12 @@@ dtb-$(CONFIG_MACH_ARMADA_39X) += 
        armada-398-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_XP) += \
        armada-xp-axpwifiap.dtb \
 +      armada-xp-crs305-1g-4s.dtb \
 +      armada-xp-crs305-1g-4s-bit.dtb \
 +      armada-xp-crs326-24g-2s.dtb \
 +      armada-xp-crs326-24g-2s-bit.dtb \
 +      armada-xp-crs328-4c-20s-4s.dtb \
 +      armada-xp-crs328-4c-20s-4s-bit.dtb \
        armada-xp-db.dtb \
        armada-xp-db-dxbc2.dtb \
        armada-xp-db-xc3-24g4xg.dtb \