Commit 17ed8fd2 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'imx-dt-7.1' of... 

Merge tag 'imx-dt-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux into soc/dt

i.MX ARM device tree changes for 7.1:

- Device Tree Schema Compliance Fixes

  Fixed numerous CHECK_DTBS warnings across multiple i.MX SoC families
  Renamed nodes to match schema requirements (tcq→touchscreen,
  uart8250→serial, iomuxc→pinmux, etc.). Fixed node naming conventions
  (added "led-" prefix, proper addressing formats).

  Corrected compatible strings and removed undocumented fallbacks. Added
  required properties (clocks, clock-names, power supplies,
  #sound-dai-cells).

- New Hardware Support

  Added DT overlays for various expansion modules (i.MX6 DHCOM PDK2,
  PicoITX display boards). Added support for muRata 1YN WiFi chip
  (replacement for 1DX) on i.MX6ULL DHCOR board.

  i.MX7ULP: Added CPU clock and OPP table support for frequency scaling.

- Boot Phase Properties
  Added bootph.yaml properties to multiple TQ-Systems boards and SoCs:
  imx7s, tqma7, mba7 imx6ul/ull, tqma6ul/ull, mba6ulx imx6qdl, tqma6, mba6.

- Bug Fixes & Corrections

  Fixed interrupt property usage (interrupts→interrupts-extended where
  needed). Corrected spelling ("TQ-Systems" with hyphen). Removed redundant
  intermediate nodes in pinmux hierarchy. Fixed clock references and
  naming.

* tag 'imx-dt-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux

: (43 commits)
  ARM: dts: imx: Add DT overlays for DH i.MX6 DHCOM SoM and boards
  ARM: dts: imx6sx: remove fallback compatible string fsl,imx28-lcdif
  ARM: dts: imx25: rename node name tcq to touchscreen
  ARM: dts: imx: b850v3: Disable unused usdhc4
  ARM: dts: imx: b850v3: Define GPIO line names
  ARM: dts: imx: b850v3: Use alphabetical sorting
  ARM: dts: imx: bx50v3: Configure phy-mode to eliminate a warning
  ARM: dts: imx: bx50v3: Configure switch PHY max-speed to 100Mbps
  ARM: dts: imx7ulp: Add CPU clock and OPP table support
  ARM: dts: imx7-mba7: Deassert BOOT_EN after boot
  ARM: dts: tqma7: add boot phase properties
  ARM: dts: imx7s: add boot phase properties
  ARM: dts: tqma6ul[l]: correct spelling of TQ-Systems
  ARM: dts: mba6ulx: add boot phase properties
  ARM: dts: imx6ul[l]-tqma6ul[l]: add boot phase properties
  ARM: dts: imx6ul/imx6ull: add boot phase properties
  ARM: dts: imx6qdl-mba6: add boot phase properties
  ARM: dts: imx6qdl-tqma6: add boot phase properties
  ARM: dts: imx6qdl: add boot phase properties
  ARM: dts: imx6qdl-tqma6: add missing labels
  ...

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 4177ec9d 0037d166

arch/arm/boot/dts/nxp/imx/Makefile

+37 −0
Original line number Diff line number Diff line
@@ -58,6 +58,31 @@ dtb-$(CONFIG_SOC_IMX53) += \ 
	imx53-voipac-bsb.dtb

imx53-qsb-hdmi-dtbs := imx53-qsb.dtb imx53-qsb-hdmi.dtbo

imx53-qsrb-hdmi-dtbs := imx53-qsrb.dtb imx53-qsb-hdmi.dtbo



imx6qdl-dhcom-pdk2-overlay-497-200-x12-dtbs := \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-pdk2-overlay-497-200-x12.dtbo



imx6qdl-dhcom-pdk2-overlay-505-200-x12-ch101olhlwh-dtbs := \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtbo



imx6qdl-dhcom-pdk2-overlay-531-100-x21-dtbs := \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-pdk2-overlay-531-100-x21.dtbo



imx6qdl-dhcom-pdk2-overlay-531-100-x22-dtbs := \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-pdk2-overlay-531-100-x22.dtbo



imx6qdl-dhcom-pdk2-overlay-560-200-x12-dtbs := \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-pdk2-overlay-560-200-x12.dtbo



imx6qdl-dhcom-picoitx-overlay-626-100-x2-ch101olhlwh-dtbs := \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-picoitx-overlay-626-100-x2-ch101olhlwh.dtbo



dtb-$(CONFIG_SOC_IMX6Q) += \

	imx6dl-alti6p.dtb \

	imx6dl-apf6dev.dtb \
@@ -179,6 +204,18 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-cubox-i-som-v15.dtb \

	imx6q-dfi-fs700-m60.dtb \

	imx6q-dhcom-pdk2.dtb \

	imx6qdl-dhcom-pdk2-overlay-497-200-x12.dtb \

	imx6qdl-dhcom-pdk2-overlay-497-200-x12.dtbo \

	imx6qdl-dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtb \

	imx6qdl-dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtbo \

	imx6qdl-dhcom-pdk2-overlay-531-100-x21.dtb \

	imx6qdl-dhcom-pdk2-overlay-531-100-x21.dtbo \

	imx6qdl-dhcom-pdk2-overlay-531-100-x22.dtb \

	imx6qdl-dhcom-pdk2-overlay-531-100-x22.dtbo \

	imx6qdl-dhcom-pdk2-overlay-560-200-x12.dtb \

	imx6qdl-dhcom-pdk2-overlay-560-200-x12.dtbo \

	imx6qdl-dhcom-picoitx-overlay-626-100-x2-ch101olhlwh.dtb \

	imx6qdl-dhcom-picoitx-overlay-626-100-x2-ch101olhlwh.dtbo \

	imx6q-display5-tianma-tm070-1280x768.dtb \

	imx6q-dmo-edmqmx6.dtb \

	imx6q-dms-ba16.dtb \

arch/arm/boot/dts/nxp/imx/imx1-ads.dts

+53 −55
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ nor: flash@0,0 { 
};



&iomuxc {

	imx1-ads {

	pinctrl_cspi1: cspi1grp {

		fsl,pins = <

			MX1_PAD_SPI1_MISO__SPI1_MISO	0x0
@@ -132,4 +131,3 @@ MX1_PAD_LBA__LBA 0x0 
		>;

	};

};
 
};

arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts

+45 −47
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ eth: ethernet@4,c00000 { 
};



&iomuxc {

	imx1-apf9328 {

	pinctrl_eth: ethgrp {

		fsl,pins = <

			MX1_PAD_SIM_SVEN__GPIO2_14	0x0
@@ -119,4 +118,3 @@ MX1_PAD_LBA__LBA 0x0 
		>;

	};

};
 
};

arch/arm/boot/dts/nxp/imx/imx1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ clks: ccm@21b000 { 
				#clock-cells = <1>;

			};



			iomuxc: iomuxc@21c000 {

			iomuxc: pinmux@21c000 {

				compatible = "fsl,imx1-iomuxc";

				reg = <0x0021c000 0x1000>;

				#address-cells = <1>;

arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi

+18 −20
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ rtc@51 { 
};



&iomuxc {

	imx25-eukrea-cpuimx25 {

	pinctrl_fec: fecgrp {

		fsl,pins = <

			MX25_PAD_FEC_MDC__FEC_MDC		0x80000000
@@ -56,7 +55,6 @@ MX25_PAD_I2C1_DAT__I2C1_DAT 0x80000000 
		>;

	};

};

};



&nfc {

	nand-bus-width = <8>;