Unverified Commit 31df43ef authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt 

i.MX ARM device tree update for 5.19:

- New board support: PHYTEC phyGATE-Tauri-S, TQ-Systems MBa6UL,
  LS1021A IoT board, Toradex Iris and Aster carrier, i.MX7D SMEGW01,
  i.MXRT1050 EVK, Bosch ACC board.
- A series from Alexander Stein to update i.MX51 based digi-connectcore
  board, regarding to DMA of UART devices, PMIC voltages, USB
  vbus-supply and usbphy.
- A series of changes from David Jander and Oleksij Rempel to remove
  prototype specific deprecated code not used in production from
  i.MX6Q/DL Vicut1 board, and unify Vicut1 and Victgo variants to reduce
  maintaining overhead.
- Quite some changes from different people to update imx6ull-colibri board
  on various aspects, touchscreen, device tree overlays, NAND BCH geometry,
  GPIO line names, FEC phy-supply, etc.
- A couple of changes from Fabio Estevam to switch imx6dl-plybas and
  imx6ul-kontron-n6x1x-s to use standard 'uart-has-rtscts' property.
- A couple of patches from Li Yang to update IFC device compatible and
  node name for LayerScape SoCs.
- Disable USB host to work around boot issue on imx6qdl-udoo board.
- A series from Max Krummenacher to update Colibri i.MX6DL device trees,
  drop dedicated v1.1 DT, disable add-on accessories, cleanups, etc.
- Various random and small updates on i.MX28 and i.MX6 boards.

* tag 'imx-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (77 commits)
  ARM: dts: imx6ull-colibri: improve pinctrl node names
  ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi
  ARM: dts: imx6ull-colibri: add/update some comments
  ARM: dts: imx6ull-colibri: fix nand bch geometry
  ARM: dts: imx6ull-colibri: add support for toradex aster carrier boards
  ARM: dts: imx6ull-colibri: add support for toradex iris carrier boards
  ARM: dts: imx6ull-colibri: add gpio-line-names
  ARM: dts: imx6ull-colibri: update device trees to support overlays
  ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling
  ARM: dts: imx6ull-colibri: add touchscreen device nodes
  ARM: dts: imx6ull-colibri: add phy-supply to fec
  ARM: dts: imx6ull-colibri: change touch i2c parameters
  ARM: dts: imx6ull-colibri: use pull-down for adc pins
  ARM: dts: Add bosch acc board
  ARM: dts: imx: Add i.MXRT1050-EVK support
  ARM: dts: imx7d-smegw01: Add support for i.MX7D SMEGW01 board
  ARM: dts: imx6qdl-udoo: Disable USB host to work around boot issues
  ARM: dts: imx27: use new 'dma-channels' property
  ARM: dts: imx6qdl-phytec: Add LED labels
  ARM: dts: ls1021a: reduce the interrupt-map-mask
  ...

Link: https://lore.kernel.org/r/20220508033843.2773685-3-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d4dcdc53 19a434aa

arch/arm/boot/dts/Makefile

+24 −1
Original line number Diff line number Diff line
@@ -462,8 +462,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-aristainetos_7.dtb \

	imx6dl-aristainetos2_4.dtb \

	imx6dl-aristainetos2_7.dtb \

	imx6dl-colibri-aster.dtb \

	imx6dl-colibri-eval-v3.dtb \

	imx6dl-colibri-v1_1-eval-v3.dtb \

	imx6dl-colibri-iris.dtb \

	imx6dl-colibri-iris-v2.dtb \

	imx6dl-cubox-i.dtb \

	imx6dl-cubox-i-emmc-som-v15.dtb \

	imx6dl-cubox-i-som-v15.dtb \
@@ -551,6 +553,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-b450v3.dtb \

	imx6q-b650v3.dtb \

	imx6q-b850v3.dtb \

	imx6q-bosch-acc.dtb \

	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \

	imx6q-cubox-i-emmc-som-v15.dtb \
@@ -694,6 +697,9 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-kontron-n6310-s.dtb \

	imx6ul-kontron-n6310-s-43.dtb \

	imx6ul-liteboard.dtb \

	imx6ul-tqma6ul1-mba6ulx.dtb \

	imx6ul-tqma6ul2-mba6ulx.dtb \

	imx6ul-tqma6ul2l-mba6ulx.dtb \

	imx6ul-opos6uldev.dtb \

	imx6ul-pico-dwarf.dtb \

	imx6ul-pico-hobbit.dtb \
@@ -705,15 +711,28 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-tx6ul-0011.dtb \

	imx6ul-tx6ul-mainboard.dtb \

	imx6ull-14x14-evk.dtb \

	imx6ull-colibri-aster.dtb \

	imx6ull-colibri-emmc-aster.dtb \

	imx6ull-colibri-emmc-eval-v3.dtb \

	imx6ull-colibri-emmc-iris.dtb \

	imx6ull-colibri-emmc-iris-v2.dtb \

	imx6ull-colibri-eval-v3.dtb \

	imx6ull-colibri-iris.dtb \

	imx6ull-colibri-iris-v2.dtb \

	imx6ull-colibri-wifi-aster.dtb \

	imx6ull-colibri-wifi-eval-v3.dtb \

	imx6ull-colibri-wifi-iris.dtb \

	imx6ull-colibri-wifi-iris-v2.dtb \

	imx6ull-jozacp.dtb \

	imx6ull-myir-mys-6ulx-eval.dtb \

	imx6ull-opos6uldev.dtb \

	imx6ull-phytec-segin-ff-rdk-nand.dtb \

	imx6ull-phytec-segin-ff-rdk-emmc.dtb \

	imx6ull-phytec-segin-lc-rdk-nand.dtb \

	imx6ull-phytec-tauri-emmc.dtb \

	imx6ull-phytec-tauri-nand.dtb \

	imx6ull-tqma6ull2-mba6ulx.dtb \

	imx6ull-tqma6ull2l-mba6ulx.dtb \

	imx6ulz-14x14-evk.dtb \

	imx6ulz-bsh-smm-m2.dtb

dtb-$(CONFIG_SOC_IMX7D) += \
@@ -736,6 +755,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-sdb.dtb \

	imx7d-sdb-reva.dtb \

	imx7d-sdb-sht11.dtb \

	imx7d-smegw01.dtb \

	imx7d-zii-rmu2.dtb \

	imx7d-zii-rpu2.dtb \

	imx7s-colibri-aster.dtb \
@@ -745,9 +765,12 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
dtb-$(CONFIG_SOC_IMX7ULP) += \

	imx7ulp-com.dtb \

	imx7ulp-evk.dtb

dtb-$(CONFIG_SOC_IMXRT) += \

	imxrt1050-evk.dtb

dtb-$(CONFIG_SOC_LAN966) += \

	lan966x-pcb8291.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-iot.dtb \

	ls1021a-moxa-uc-8410a.dtb \

	ls1021a-qds.dtb \

	ls1021a-tsn.dtb \

arch/arm/boot/dts/imx27.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
					 <&clks IMX27_CLK_DMA_AHB_GATE>;

				clock-names = "ipg", "ahb";

				#dma-cells = <1>;

				#dma-channels = <16>;

				dma-channels = <16>;

			};



			wdog: watchdog@10002000 {

arch/arm/boot/dts/imx28-evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "sst,sst25vf016b", "jedec,spi-nor";

arch/arm/boot/dts/imx28-m28evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "m25p80", "jedec,spi-nor";

arch/arm/boot/dts/imx28-sps1.dts

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "everspin,mr25h256", "mr25h256";