[PATCH 15/17] arm: dts: omap: Non-functional changes sync with v6.3-rc6

11 Apr 2023

This is a collection of all the whitespace, renames, comment, and other
changes that should not change the DT functionality from Linux v6.3-rc6.
Signed-off-by: Andrew Davis afd@ti.com
---
 arch/arm/dts/omap-gpmc-smsc911x.dtsi         |  6 ++--
 arch/arm/dts/omap-gpmc-smsc9221.dtsi         |  6 ++--
 arch/arm/dts/omap3-beagle-xm.dts             | 12 +++----
 arch/arm/dts/omap3-beagle.dts                |  6 ++--
 arch/arm/dts/omap3-cpu-thermal.dtsi          |  2 +-
 arch/arm/dts/omap3-evm-37xx.dts              |  2 +-
 arch/arm/dts/omap3-evm-processor-common.dtsi |  2 +-
 arch/arm/dts/omap3-evm.dts                   |  2 +-
 arch/arm/dts/omap3-igep.dtsi                 |  2 +-
 arch/arm/dts/omap3.dtsi                      |  2 +-
 arch/arm/dts/omap4-cpu-thermal.dtsi          | 24 ++++++-------
 arch/arm/dts/omap4-l4.dtsi                   |  4 +--
 arch/arm/dts/omap4-panda-common.dtsi         |  6 ++--
 arch/arm/dts/omap4-panda-es.dts              |  4 +--
 arch/arm/dts/omap4-sdp.dts                   | 36 +++++++++++---------
 arch/arm/dts/omap4.dtsi                      | 10 ++++--
 arch/arm/dts/omap5-board-common.dtsi         |  2 +-
 arch/arm/dts/omap5-l4.dtsi                   |  8 ++---
 arch/arm/dts/omap5-uevm.dts                  |  2 +-
 arch/arm/dts/omap54xx-clocks.dtsi            |  2 +-
 20 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/arch/arm/dts/omap-gpmc-smsc911x.dtsi b/arch/arm/dts/omap-gpmc-smsc911x.dtsi
index ded7e8fec9e..9cf52650f07 100644
--- a/arch/arm/dts/omap-gpmc-smsc911x.dtsi
+++ b/arch/arm/dts/omap-gpmc-smsc911x.dtsi
@@ -8,9 +8,9 @@
/ {
    vddvario: regulator-vddvario {
-		  compatible = "regulator-fixed";
-		  regulator-name = "vddvario";
-		  regulator-always-on;
+		compatible = "regulator-fixed";
+		regulator-name = "vddvario";
+		regulator-always-on;
    };
vdd33a: regulator-vdd33a {
diff --git a/arch/arm/dts/omap-gpmc-smsc9221.dtsi b/arch/arm/dts/omap-gpmc-smsc9221.dtsi
index 7f6aefd1345..ac81793209c 100644
--- a/arch/arm/dts/omap-gpmc-smsc9221.dtsi
+++ b/arch/arm/dts/omap-gpmc-smsc9221.dtsi
@@ -12,9 +12,9 @@
/ {
    vddvario: regulator-vddvario {
-		  compatible = "regulator-fixed";
-		  regulator-name = "vddvario";
-		  regulator-always-on;
+		compatible = "regulator-fixed";
+		regulator-name = "vddvario";
+		regulator-always-on;
    };
vdd33a: regulator-vdd33a {
diff --git a/arch/arm/dts/omap3-beagle-xm.dts b/arch/arm/dts/omap3-beagle-xm.dts
index 026c985a10e..73152f6fa82 100644
--- a/arch/arm/dts/omap3-beagle-xm.dts
+++ b/arch/arm/dts/omap3-beagle-xm.dts
@@ -27,26 +27,26 @@
    	ethernet = &ethernet;
    };
-	leds {
+	led-controller-1 {
    	compatible = "gpio-leds";
-		heartbeat {
+		led-1 {
    		label = "beagleboard::usr0";
    		gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
    		linux,default-trigger = "heartbeat";
    	};
-		mmc {
+		led-2 {
    		label = "beagleboard::usr1";
    		gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
    		linux,default-trigger = "mmc0";
    	};
    };
-	pwmleds {
+	led-controller-2 {
    	compatible = "pwm-leds";
-		pmu_stat {
+		led-3 {
    		label = "beagleboard::pmu_stat";
    		pwms = <&twl_pwmled 1 7812500>;
    		max-brightness = <127>;
@@ -357,7 +357,7 @@
    	#address-cells = <1>;
    	#size-cells = <0>;
-		ethernet: usbether@1 {
+		ethernet: ethernet@1 {
    		compatible = "usb424,ec00";
    		reg = <1>;
    	};
diff --git a/arch/arm/dts/omap3-beagle.dts b/arch/arm/dts/omap3-beagle.dts
index d5b41d63dbf..321b6d7448a 100644
--- a/arch/arm/dts/omap3-beagle.dts
+++ b/arch/arm/dts/omap3-beagle.dts
@@ -28,18 +28,18 @@
leds {
    	compatible = "gpio-leds";
-		pmu_stat {
+		led-pmu-stat {
    		label = "beagleboard::pmu_stat";
    		gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
    	};
-		heartbeat {
+		led-heartbeat {
    		label = "beagleboard::usr0";
    		gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
    		linux,default-trigger = "heartbeat";
    	};
-		mmc {
+		led-mmc {
    		label = "beagleboard::usr1";
    		gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
    		linux,default-trigger = "mmc0";
diff --git a/arch/arm/dts/omap3-cpu-thermal.dtsi b/arch/arm/dts/omap3-cpu-thermal.dtsi
index 65b041ecdb9..e677d1d656b 100644
--- a/arch/arm/dts/omap3-cpu-thermal.dtsi
+++ b/arch/arm/dts/omap3-cpu-thermal.dtsi
@@ -7,7 +7,7 @@
#include <dt-bindings/thermal/thermal.h>
-cpu_thermal: cpu_thermal {
+cpu_thermal: cpu-thermal {
    polling-delay-passive = <250>; /* milliseconds */
    polling-delay = <1000>; /* milliseconds */
    coefficients = <0 20000>;
diff --git a/arch/arm/dts/omap3-evm-37xx.dts b/arch/arm/dts/omap3-evm-37xx.dts
index c9332195d09..abd403c228c 100644
--- a/arch/arm/dts/omap3-evm-37xx.dts
+++ b/arch/arm/dts/omap3-evm-37xx.dts
@@ -60,7 +60,7 @@
    	interrupt-parent = <&gpmc>;
    	interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
    		     <1 IRQ_TYPE_NONE>;	/* termcount */
-		linux,mtd-name= "hynix,h8kds0un0mer-4em";
+		linux,mtd-name = "hynix,h8kds0un0mer-4em";
    	nand-bus-width = <16>;
    	gpmc,device-width = <2>;
    	ti,nand-ecc-opt = "bch8";
diff --git a/arch/arm/dts/omap3-evm-processor-common.dtsi b/arch/arm/dts/omap3-evm-processor-common.dtsi
index b4109f48ec1..e6ba30a2116 100644
--- a/arch/arm/dts/omap3-evm-processor-common.dtsi
+++ b/arch/arm/dts/omap3-evm-processor-common.dtsi
@@ -195,7 +195,7 @@
  * for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V.
  */
 &gpio2 {
-	en_usb2_port {
+	en-usb2-port-hog {
    	gpio-hog;
    	gpios = <29 GPIO_ACTIVE_HIGH>;	/* gpio_61 */
    	output-low;
diff --git a/arch/arm/dts/omap3-evm.dts b/arch/arm/dts/omap3-evm.dts
index 5cc0cf7cd16..f95eea63b35 100644
--- a/arch/arm/dts/omap3-evm.dts
+++ b/arch/arm/dts/omap3-evm.dts
@@ -60,7 +60,7 @@
    	interrupt-parent = <&gpmc>;
    	interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
    		     <1 IRQ_TYPE_NONE>;	/* termcount */
-		linux,mtd-name= "micron,mt29f2g16abdhc";
+		linux,mtd-name = "micron,mt29f2g16abdhc";
    	nand-bus-width = <16>;
    	gpmc,device-width = <2>;
    	ti,nand-ecc-opt = "bch8";
diff --git a/arch/arm/dts/omap3-igep.dtsi b/arch/arm/dts/omap3-igep.dtsi
index 99f5585097a..21920261046 100644
--- a/arch/arm/dts/omap3-igep.dtsi
+++ b/arch/arm/dts/omap3-igep.dtsi
@@ -111,7 +111,7 @@
    	interrupt-parent = <&gpmc>;
    	interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
    		     <1 IRQ_TYPE_NONE>;	/* termcount */
-		linux,mtd-name= "micron,mt29c4g96maz";
+		linux,mtd-name = "micron,mt29c4g96maz";
    	nand-bus-width = <16>;
    	gpmc,device-width = <2>;
    	ti,nand-ecc-opt = "bch8";
diff --git a/arch/arm/dts/omap3.dtsi b/arch/arm/dts/omap3.dtsi
index f801e4fef89..622ee458b60 100644
--- a/arch/arm/dts/omap3.dtsi
+++ b/arch/arm/dts/omap3.dtsi
@@ -353,7 +353,7 @@
    		#mbox-cells = <1>;
    		ti,mbox-num-users = <2>;
    		ti,mbox-num-fifos = <2>;
-			mbox_dsp: dsp {
+			mbox_dsp: mbox-dsp {
    			ti,mbox-tx = <0 0 0>;
    			ti,mbox-rx = <1 0 0>;
    		};
diff --git a/arch/arm/dts/omap4-cpu-thermal.dtsi b/arch/arm/dts/omap4-cpu-thermal.dtsi
index 4d7eeb133da..801b4f10350 100644
--- a/arch/arm/dts/omap4-cpu-thermal.dtsi
+++ b/arch/arm/dts/omap4-cpu-thermal.dtsi
@@ -13,20 +13,20 @@ cpu_thermal: cpu_thermal {
    polling-delay = <1000>; /* milliseconds */
/* sensor       ID */
-        thermal-sensors = <&bandgap     0>;
+	thermal-sensors = <&bandgap     0>;
cpu_trips: trips {
-                cpu_alert0: cpu_alert {
-                        temperature = <100000>; /* millicelsius */
-                        hysteresis = <2000>; /* millicelsius */
-                        type = "passive";
-                };
-                cpu_crit: cpu_crit {
-                        temperature = <125000>; /* millicelsius */
-                        hysteresis = <2000>; /* millicelsius */
-                        type = "critical";
-                };
-        };
+		cpu_alert0: cpu_alert {
+			temperature = <100000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "passive";
+		};
+		cpu_crit: cpu_crit {
+			temperature = <125000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "critical";
+		};
+	};
cpu_cooling_maps: cooling-maps {
    	map0 {
diff --git a/arch/arm/dts/omap4-l4.dtsi b/arch/arm/dts/omap4-l4.dtsi
index 424a6946608..84d92b8d11c 100644
--- a/arch/arm/dts/omap4-l4.dtsi
+++ b/arch/arm/dts/omap4-l4.dtsi
@@ -599,11 +599,11 @@
    			#mbox-cells = <1>;
    			ti,mbox-num-users = <3>;
    			ti,mbox-num-fifos = <8>;
-				mbox_ipu: mbox_ipu {
+				mbox_ipu: mbox-ipu {
    				ti,mbox-tx = <0 0 0>;
    				ti,mbox-rx = <1 0 0>;
    			};
-				mbox_dsp: mbox_dsp {
+				mbox_dsp: mbox-dsp {
    				ti,mbox-tx = <3 0 0>;
    				ti,mbox-rx = <2 0 0>;
    			};
diff --git a/arch/arm/dts/omap4-panda-common.dtsi b/arch/arm/dts/omap4-panda-common.dtsi
index db01581b133..6174fbe2803 100644
--- a/arch/arm/dts/omap4-panda-common.dtsi
+++ b/arch/arm/dts/omap4-panda-common.dtsi
@@ -29,13 +29,13 @@
    		&led_wkgpio_pins
    	>;
-		heartbeat {
+		led-heartbeat {
    		label = "pandaboard::status1";
    		gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
    		linux,default-trigger = "heartbeat";
    	};
-		mmc {
+		led-mmc {
    		label = "pandaboard::status2";
    		gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
    		linux,default-trigger = "mmc0";
@@ -538,7 +538,7 @@
    	#address-cells = <1>;
    	#size-cells = <0>;
-		ethernet: usbether@1 {
+		ethernet: ethernet@1 {
    		compatible = "usb424,ec00";
    		reg = <1>;
    	};
diff --git a/arch/arm/dts/omap4-panda-es.dts b/arch/arm/dts/omap4-panda-es.dts
index cfa85aa3da0..35e4f345a13 100644
--- a/arch/arm/dts/omap4-panda-es.dts
+++ b/arch/arm/dts/omap4-panda-es.dts
@@ -63,10 +63,10 @@
    	&led_wkgpio_pins
    >;
-	heartbeat {
+	led-heartbeat {
    	gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>;
    };
-	mmc {
+	led-mmc {
    	gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
    };
 };
diff --git a/arch/arm/dts/omap4-sdp.dts b/arch/arm/dts/omap4-sdp.dts
index 8b7f2ac53f6..9e976140f34 100644
--- a/arch/arm/dts/omap4-sdp.dts
+++ b/arch/arm/dts/omap4-sdp.dts
@@ -45,58 +45,60 @@
    	regulator-boot-on;
    };
-	leds {
+	led-controller-1 {
    	compatible = "gpio-leds";
-		debug0 {
+
+		led-1 {
    		label = "omap4:green:debug0";
    		gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; /* 61 */
    	};
-		debug1 {
+		led-2 {
    		label = "omap4:green:debug1";
    		gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; /* 30 */
    	};
-		debug2 {
+		led-3 {
    		label = "omap4:green:debug2";
    		gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; /* 7 */
    	};
-		debug3 {
+		led-4 {
    		label = "omap4:green:debug3";
    		gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; /* 8 */
    	};
-		debug4 {
+		led-5 {
    		label = "omap4:green:debug4";
    		gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; /* 50 */
    	};
-		user1 {
+		led-6 {
    		label = "omap4:blue:user";
    		gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* 169 */
    	};
-		user2 {
+		led-7 {
    		label = "omap4:red:user";
    		gpios = <&gpio6 10 GPIO_ACTIVE_HIGH>; /* 170 */
    	};
-		user3 {
+		led-8 {
    		label = "omap4:green:user";
    		gpios = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* 139 */
    	};
    };
-	pwmleds {
+	led-controller-2 {
    	compatible = "pwm-leds";
-		kpad {
+
+		led-9 {
    		label = "omap4::keypad";
    		pwms = <&twl_pwm 0 7812500>;
    		max-brightness = <127>;
    	};
-		charging {
+		led-10 {
    		label = "omap4:green:chrg";
    		pwms = <&twl_pwmled 0 7812500>;
    		max-brightness = <255>;
@@ -428,7 +430,7 @@
/*
     * Temperature Sensor
-	 * http://www.ti.com/lit/ds/symlink/tmp105.pdf
+	 * https://www.ti.com/lit/ds/symlink/tmp105.pdf
     */
    tmp105@48 {
    	compatible = "ti,tmp105";
@@ -453,7 +455,7 @@
/*
     * 3-Axis Digital Compass
-	 * http://www.sparkfun.com/datasheets/Sensors/Magneto/HMC5843.pdf
+	 * https://www.sparkfun.com/datasheets/Sensors/Magneto/HMC5843.pdf
     */
    hmc5843@1e {
    	compatible = "honeywell,hmc5843";
@@ -662,8 +664,9 @@
    	};
    };
-	lcd0: display {
+	lcd0: panel@0 {
    	compatible = "tpo,taal", "panel-dsi-cm";
+		reg = <0>;
    	label = "lcd0";
reset-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;	/* 102 */
@@ -687,8 +690,9 @@
    	};
    };
-	lcd1: display {
+	lcd1: panel@0 {
    	compatible = "tpo,taal", "panel-dsi-cm";
+		reg = <0>;
    	label = "lcd1";
reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;	/* 104 */
diff --git a/arch/arm/dts/omap4.dtsi b/arch/arm/dts/omap4.dtsi
index 1fc9a2f66bf..d1ab5f4db83 100644
--- a/arch/arm/dts/omap4.dtsi
+++ b/arch/arm/dts/omap4.dtsi
@@ -71,7 +71,7 @@
    	interrupt-parent = <&gic>;
    };
-	L2: l2-cache-controller@48242000 {
+	L2: cache-controller@48242000 {
    	compatible = "arm,pl310-cache";
    	reg = <0x48242000 0x1000>;
    	cache-unified;
@@ -389,7 +389,7 @@
    		status = "disabled";
    	};
-		target-module@56000000 {
+		sgx_module: target-module@56000000 {
    		compatible = "ti,sysc-omap4", "ti,sysc";
    		reg = <0x5600fe00 0x4>,
    		      <0x5600fe10 0x4>;
@@ -551,6 +551,9 @@
    					clocks = <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 8>,
    						 <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 10>;
    					clock-names = "fck", "sys_clk";
+
+						#address-cells = <1>;
+						#size-cells = <0>;
    				};
    			};
@@ -583,6 +586,9 @@
    					clocks = <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 8>,
    					         <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 10>;
    					clock-names = "fck", "sys_clk";
+
+						#address-cells = <1>;
+						#size-cells = <0>;
    				};
    			};
diff --git a/arch/arm/dts/omap5-board-common.dtsi b/arch/arm/dts/omap5-board-common.dtsi
index d8f13626cfd..45435bb88c8 100644
--- a/arch/arm/dts/omap5-board-common.dtsi
+++ b/arch/arm/dts/omap5-board-common.dtsi
@@ -149,7 +149,7 @@
&gpio8 {
    /* TI trees use GPIO instead of msecure, see also muxing */
-	p234 {
+	msecure-hog {
    	gpio-hog;
    	gpios = <10 GPIO_ACTIVE_HIGH>;
    	output-high;
diff --git a/arch/arm/dts/omap5-l4.dtsi b/arch/arm/dts/omap5-l4.dtsi
index 8582016d65d..4521b6447f6 100644
--- a/arch/arm/dts/omap5-l4.dtsi
+++ b/arch/arm/dts/omap5-l4.dtsi
@@ -195,7 +195,7 @@
    			#size-cells = <1>;
    			utmi-mode = <2>;
    			ranges = <0 0 0x20000>;
-				dwc3: dwc3@10000 {
+				dwc3: usb@10000 {
    				compatible = "snps,dwc3";
    				reg = <0x10000 0x10000>;
    				interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
@@ -482,7 +482,7 @@
    			clocks = <&usb_phy_cm_clk32k>,
    			<&sys_clkin>,
    			<&l3init_clkctrl OMAP5_USB_OTG_SS_CLKCTRL 8>;
-				clock-names =	"wkupclk",
+				clock-names = "wkupclk",
    			"sysclk",
    			"refclk";
    			#phy-cells = <0>;
@@ -616,11 +616,11 @@
    			#mbox-cells = <1>;
    			ti,mbox-num-users = <3>;
    			ti,mbox-num-fifos = <8>;
-				mbox_ipu: mbox_ipu {
+				mbox_ipu: mbox-ipu {
    				ti,mbox-tx = <0 0 0>;
    				ti,mbox-rx = <1 0 0>;
    			};
-				mbox_dsp: mbox_dsp {
+				mbox_dsp: mbox-dsp {
    				ti,mbox-tx = <3 0 0>;
    				ti,mbox-rx = <2 0 0>;
    			};
diff --git a/arch/arm/dts/omap5-uevm.dts b/arch/arm/dts/omap5-uevm.dts
index 4203fd7bad1..b289b57d054 100644
--- a/arch/arm/dts/omap5-uevm.dts
+++ b/arch/arm/dts/omap5-uevm.dts
@@ -189,7 +189,7 @@
    	#size-cells = <0>;
    };
-	ethernet: usbether@3 {
+	ethernet: ethernet@3 {
    	compatible = "usb424,9730";
    	reg = <3>;
    };
diff --git a/arch/arm/dts/omap54xx-clocks.dtsi b/arch/arm/dts/omap54xx-clocks.dtsi
index 42f2c447727..4dd3c93e457 100644
--- a/arch/arm/dts/omap54xx-clocks.dtsi
+++ b/arch/arm/dts/omap54xx-clocks.dtsi
@@ -1118,7 +1118,7 @@
    	};
    };
-	l4per_cm: l4per_cm@1000 {
+	l4per_cm: clock@1000 {
    	compatible = "ti,omap4-cm";
    	reg = <0x1000 0x200>;
    	#address-cells = <1>;
-- 
2.39.2


    