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

Andrew Davis afd at ti.com
Tue Apr 11 20:25:07 CEST 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 at ti.com>
---
 arch/arm/dts/da850-evm.dts      | 20 ++++++++++----------
 arch/arm/dts/da850-lego-ev3.dts |  2 +-
 arch/arm/dts/da850.dtsi         | 18 +++++++++---------
 arch/arm/dts/dm8168-evm.dts     | 10 +++++-----
 arch/arm/dts/dm816x.dtsi        | 17 ++++++++++++-----
 5 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/arch/arm/dts/da850-evm.dts b/arch/arm/dts/da850-evm.dts
index 7e865bb467b..378af9f3445 100644
--- a/arch/arm/dts/da850-evm.dts
+++ b/arch/arm/dts/da850-evm.dts
@@ -52,15 +52,15 @@
 		enable-gpios = <&gpio 40 GPIO_ACTIVE_HIGH>; /* lcd_panel_pwr */
 
 		panel-info {
-			ac-bias		= <255>;
-			ac-bias-intrpt	= <0>;
-			dma-burst-sz	= <16>;
-			bpp		= <16>;
-			fdd		= <0x80>;
-			sync-edge	= <0>;
-			sync-ctrl	= <1>;
-			raster-order	= <0>;
-			fifo-th		= <0>;
+			ac-bias = <255>;
+			ac-bias-intrpt = <0>;
+			dma-burst-sz = <16>;
+			bpp = <16>;
+			fdd = <0x80>;
+			sync-edge = <0>;
+			sync-ctrl = <1>;
+			raster-order = <0>;
+			fifo-th = <0>;
 		};
 
 		display-timings {
@@ -265,7 +265,7 @@
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi1_pins &spi1_cs0_pin>;
-	flash: m25p80 at 0 {
+	flash: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "m25p64";
diff --git a/arch/arm/dts/da850-lego-ev3.dts b/arch/arm/dts/da850-lego-ev3.dts
index 6d781d5d364..7207d126b38 100644
--- a/arch/arm/dts/da850-lego-ev3.dts
+++ b/arch/arm/dts/da850-lego-ev3.dts
@@ -22,7 +22,7 @@
 		stdout-path = &serial1;
 	};
 
-	memory {
+	memory at c0000000 {
 		device_type = "memory";
 		reg = <0xc0000000 0x04000000>;
 	};
diff --git a/arch/arm/dts/da850.dtsi b/arch/arm/dts/da850.dtsi
index e6e78b88cac..c96f64b9049 100644
--- a/arch/arm/dts/da850.dtsi
+++ b/arch/arm/dts/da850.dtsi
@@ -369,7 +369,7 @@
 		edma0: edma at 0 {
 			compatible = "ti,edma3-tpcc";
 			/* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
-			reg =	<0x0 0x8000>;
+			reg = <0x0 0x8000>;
 			reg-names = "edma3_cc";
 			interrupts = <11 12>;
 			interrupt-names = "edma3_ccint", "edma3_ccerrint";
@@ -380,14 +380,14 @@
 		};
 		edma0_tptc0: tptc at 8000 {
 			compatible = "ti,edma3-tptc";
-			reg =	<0x8000 0x400>;
+			reg = <0x8000 0x400>;
 			interrupts = <13>;
 			interrupt-names = "edm3_tcerrint";
 			power-domains = <&psc0 1>;
 		};
 		edma0_tptc1: tptc at 8400 {
 			compatible = "ti,edma3-tptc";
-			reg =	<0x8400 0x400>;
+			reg = <0x8400 0x400>;
 			interrupts = <32>;
 			interrupt-names = "edm3_tcerrint";
 			power-domains = <&psc0 2>;
@@ -395,7 +395,7 @@
 		edma1: edma at 230000 {
 			compatible = "ti,edma3-tpcc";
 			/* eDMA3 CC1: 0x01e3 0000 - 0x01e3 7fff */
-			reg =	<0x230000 0x8000>;
+			reg = <0x230000 0x8000>;
 			reg-names = "edma3_cc";
 			interrupts = <93 94>;
 			interrupt-names = "edma3_ccint", "edma3_ccerrint";
@@ -406,7 +406,7 @@
 		};
 		edma1_tptc0: tptc at 238000 {
 			compatible = "ti,edma3-tptc";
-			reg =	<0x238000 0x400>;
+			reg = <0x238000 0x400>;
 			interrupts = <95>;
 			interrupt-names = "edm3_tcerrint";
 			power-domains = <&psc1 21>;
@@ -543,7 +543,7 @@
 			power-domains = <&psc1 17>;
 			status = "disabled";
 		};
-		ecap0: ecap at 306000 {
+		ecap0: pwm at 306000 {
 			compatible = "ti,da850-ecap", "ti,am3352-ecap",
 				     "ti,am33xx-ecap";
 			#pwm-cells = <3>;
@@ -553,7 +553,7 @@
 			power-domains = <&psc1 20>;
 			status = "disabled";
 		};
-		ecap1: ecap at 307000 {
+		ecap1: pwm at 307000 {
 			compatible = "ti,da850-ecap", "ti,am3352-ecap",
 				     "ti,am33xx-ecap";
 			#pwm-cells = <3>;
@@ -563,7 +563,7 @@
 			power-domains = <&psc1 20>;
 			status = "disabled";
 		};
-		ecap2: ecap at 308000 {
+		ecap2: pwm at 308000 {
 			compatible = "ti,da850-ecap", "ti,am3352-ecap",
 				     "ti,am33xx-ecap";
 			#pwm-cells = <3>;
@@ -627,7 +627,7 @@
 
 			cppi41dma: dma-controller at 201000 {
 				compatible = "ti,da830-cppi41";
-				reg =  <0x201000 0x1000
+				reg = <0x201000 0x1000
 					0x202000 0x1000
 					0x204000 0x4000>;
 				reg-names = "controller",
diff --git a/arch/arm/dts/dm8168-evm.dts b/arch/arm/dts/dm8168-evm.dts
index 2a457c943e3..70255ab2598 100644
--- a/arch/arm/dts/dm8168-evm.dts
+++ b/arch/arm/dts/dm8168-evm.dts
@@ -116,19 +116,19 @@
 			label = "X-Loader";
 			reg = <0 0x80000>;
 		};
-		partition at 0x80000 {
+		partition at 80000 {
 			label = "U-Boot";
 			reg = <0x80000 0x1c0000>;
 		};
-		partition at 0x1c0000 {
+		partition at 1c0000 {
 			label = "Environment";
 			reg = <0x240000 0x40000>;
 		};
-		partition at 0x280000 {
+		partition at 280000 {
 			label = "Kernel";
 			reg = <0x280000 0x500000>;
 		};
-		partition at 0x780000 {
+		partition at 780000 {
 			label = "Filesystem";
 			reg = <0x780000 0xf880000>;
 		};
@@ -139,7 +139,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&mcspi1_pins>;
 
-	m25p80 at 0 {
+	flash at 0 {
 		compatible = "w25x32";
 		spi-max-frequency = <48000000>;
 		reg = <0>;
diff --git a/arch/arm/dts/dm816x.dtsi b/arch/arm/dts/dm816x.dtsi
index ae2d9386fc8..c4a8653b7f0 100644
--- a/arch/arm/dts/dm816x.dtsi
+++ b/arch/arm/dts/dm816x.dtsi
@@ -63,8 +63,11 @@
 		ranges;
 
 		prcm: prcm at 48180000 {
-			compatible = "ti,dm816-prcm";
+			compatible = "ti,dm816-prcm", "simple-bus";
 			reg = <0x48180000 0x4000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0 0x48180000 0x4000>;
 
 			prcm_clocks: clocks {
 				#address-cells = <1>;
@@ -86,6 +89,8 @@
 			dm816x_pinmux: pinmux at 800 {
 				compatible = "pinctrl-single";
 				reg = <0x800 0x50a>;
+				#address-cells = <1>;
+				#size-cells = <0>;
 				#pinctrl-cells = <1>;
 				pinctrl-single,register-width = <16>;
 				pinctrl-single,function-mask = <0xf>;
@@ -121,6 +126,8 @@
 			};
 
 			scrm_clocks: clocks {
+				#address-cells = <1>;
+				#size-cells = <0>;
 			};
 
 			scrm_clockdomains: clockdomains {
@@ -228,7 +235,7 @@
 			#mbox-cells = <1>;
 			ti,mbox-num-users = <4>;
 			ti,mbox-num-fifos = <12>;
-			mbox_dsp: mbox_dsp {
+			mbox_dsp: mbox-dsp {
 				ti,mbox-tx = <3 0 0>;
 				ti,mbox-rx = <0 0 0>;
 			};
@@ -364,7 +371,7 @@
 			ti,timer-pwm;
 		};
 
-		uart1: uart at 48020000 {
+		uart1: serial at 48020000 {
 			compatible = "ti,am3352-uart", "ti,omap3-uart";
 			ti,hwmods = "uart1";
 			reg = <0x48020000 0x2000>;
@@ -374,7 +381,7 @@
 			dma-names = "tx", "rx";
 		};
 
-		uart2: uart at 48022000 {
+		uart2: serial at 48022000 {
 			compatible = "ti,am3352-uart", "ti,omap3-uart";
 			ti,hwmods = "uart2";
 			reg = <0x48022000 0x2000>;
@@ -384,7 +391,7 @@
 			dma-names = "tx", "rx";
 		};
 
-		uart3: uart at 48024000 {
+		uart3: serial at 48024000 {
 			compatible = "ti,am3352-uart", "ti,omap3-uart";
 			ti,hwmods = "uart3";
 			reg = <0x48024000 0x2000>;
-- 
2.39.2



More information about the U-Boot mailing list