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

i.MX ARM device tree change for 6.6:

- New device tree for TQ-Systems MBLS102xA board.
- A bunch of dtschema warning fixes from Fabio Estevam and
  Krzysztof Kozlowski.
- Add missing supply regulator for imx6qdl-mba6 and imx6qdl-tqma6x.
- Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties.
- Disable the internal i.MX6 watchdog and rely on PMIC reboot handler
  for phycore and pfla02 boards.
- Replace NO_PAD_CTL by explicit pad configuration for karo-tx25 board.

* tag 'imx-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (35 commits)
  ARM: dts: imx6qdl: mba6: Fix gpio-keys button node names
  ARM: dts: imx6ul: Fix nand-controller #size-cells
  ARM: dts: imx6ul: mba6ulx: Fix stmpe811 node warnings
  ARM: dts: imx6dl-b1x5pv2: Fix simple-audio routing property
  ARM: dts: imx6q-prti6q: Fix the SDIO wifi node
  ARM: dts: vfxxx: Pass 'mmc' as the esdhc node names
  ARM: dts: imx53-smd: Remove invalid SPI flash entry
  ARM: dts: imx50-evk: Use generic node name for SPI NOR flash
  ARM: dts: imx6q-cm-fx6: Remove invalid SPI flash entry
  ARM: dts: ls1021a: add TQMLS1021A flash partition layout
  ARM: dts: ls1021a: add TQ-Systems MBLS102xA device tree
  ARM: dts: imx: Remove 'compatible' from the pfuze nodes
  ARM: dts: imx: Pass #sound-dai-cells to sgtl5000
  ARM: dts: nxp: mxs: split interrupts per cells
  ARM: dts: imx6ul-geam: Remove invalid sgtl5000 property
  ARM: dts: imx28: drop incorrect reg in fixed regulators
  ARM: dts: imx27: drop incorrect reg in fixed regulators
  ARM: dts: imx25: drop incorrect reg in fixed regulators
  ARM: dts: imx23: drop incorrect reg in fixed regulators
  ARM: dts: imx50-kobo-aura: switch to enable-gpios
  ...

Link: https://lore.kernel.org/r/20230813133354.847010-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 35 insertions, 44 deletions

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi
index 6d4eab1942b9..f2542d725ce7 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi
@@ -15,51 +15,41 @@
 		reg = <0x10000000 0x20000000>;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
+	reg_2p5v: regulator-2p5v {
+		compatible = "regulator-fixed";
+		regulator-name = "2P5V";
+		regulator-min-microvolt = <2500000>;
+		regulator-max-microvolt = <2500000>;
+		regulator-always-on;
+	};
 
-		reg_2p5v: regulator@0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "2P5V";
-			regulator-min-microvolt = <2500000>;
-			regulator-max-microvolt = <2500000>;
-			regulator-always-on;
-		};
-
-		reg_3p3v: regulator@1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "3P3V";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-		};
-
-		reg_usb_otg_vbus: regulator@2 {
-			compatible = "regulator-fixed";
-			reg = <2>;
-			regulator-name = "usb_otg_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
-
-		reg_wlan_vmmc: regulator@3 {
-			compatible = "regulator-fixed";
-			reg = <3>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_wlan_vmmc>;
-			regulator-name = "reg_wlan_vmmc";
-			regulator-min-microvolt = <1800000>;
-			regulator-max-microvolt = <1800000>;
-			gpio = <&gpio6 7 GPIO_ACTIVE_HIGH>;
-			startup-delay-us = <70000>;
-			enable-active-high;
-		};
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "3P3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+
+	reg_usb_otg_vbus: regulator-usb-otg-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_otg_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
+	reg_wlan_vmmc: regulator-wlan-vmmc {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_wlan_vmmc>;
+		regulator-name = "reg_wlan_vmmc";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		gpio = <&gpio6 7 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <70000>;
+		enable-active-high;
 	};
 
 	gpio-keys {
@@ -236,6 +226,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_sgtl5000>;
 		reg = <0x0a>;
+		#sound-dai-cells = <0>;
 		clocks = <&clks IMX6QDL_CLK_CKO>;
 		VDDA-supply = <&reg_2p5v>;
 		VDDIO-supply = <&reg_3p3v>;