device_tree: Sync: dm: dts: Convert driver model tags to use new schema.

Now that Linux has accepted these tags, move the device tree files in U-Boot over to use them. (8c103c33fb14 commit in DTG) Signed-off-by: Swagath Gadde <[email protected]> Signed-off-by: Onkar Harsh <[email protected]> Acked-by: Appana Durga Kedareswara rao <[email protected]>
Livius90 · Apr 26, 2024 · d2bdb6e · d2bdb6e
1 parent a58123f
commit d2bdb6e
Show file tree

Hide file tree

Showing 31 changed files with 110 additions and 109 deletions.
diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-a2197-sc-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-a2197-sc-reva.dtsi
@@ -47,11 +47,11 @@
 };
 
 &uart0 { /* uart0 MIO38-39 */
-	u-boot,dm-pre-reloc;
+	bootph-all;
 };
 
 &uart1 { /* uart1 MIO40-41 */
-	u-boot,dm-pre-reloc;
+	bootph-all;
 };
 
 &sdhci1 { /* sd1 MIO45-51 cd in place */

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-emu-itr8-cn13940875.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-emu-itr8-cn13940875.dtsi
@@ -21,14 +21,14 @@
 	};
 
 	clk0212: clk0212 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "fixed-clock";
 		#clock-cells = <0x0>;
 		clock-frequency = <212000>;
 	};
 
 	clk25: clk25 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "fixed-clock";
 		#clock-cells = <0x0>;
 		clock-frequency = <25000000>;

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-net-emu-rev1.9.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-net-emu-rev1.9.dtsi
@@ -126,7 +126,7 @@
 	};
 
 	clk1: clk1 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <1000000>; /* it doesn't matter on EMU */
@@ -139,7 +139,7 @@
 
 	amba: axi {
 		compatible = "simple-bus";
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
@@ -153,7 +153,7 @@
 		};
 
 		serial0: serial@f1920000 {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0 0xf1920000 0 0x1000>;
 			interrupts = <0 25 4>;

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-net-ipp-rev1.9.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-net-ipp-rev1.9.dtsi
@@ -128,7 +128,7 @@
 
 	ref_clk: ref_clk {
 		compatible = "fixed-clock";
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		#clock-cells = <0>;
 		clock-frequency = <33333333>;
 	};
@@ -137,12 +137,12 @@
 		versal_net_firmware: versal-net-firmware {
 			compatible = "xlnx,versal-net-firmware", "xlnx,versal-firmware";
 			interrupt-parent = <&gic>;
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			method = "smc";
 			#power-domain-cells = <0x01>;
 
 			versal_net_clk: clock-controller {
-				u-boot,dm-pre-reloc;
+				bootph-all;
 				#clock-cells = <1>;
 				compatible = "xlnx,versal-net-clk", "xlnx,versal-clk";
 				clocks = <&ref_clk>, <&ref_clk>;
@@ -196,7 +196,7 @@
 
 	amba: axi {
 		compatible = "simple-bus";
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
@@ -548,7 +548,7 @@
 		};
 
 		serial0: serial@f1920000 {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0 0xf1920000 0 0x1000>;
 			interrupts = <0 25 4>;
@@ -562,7 +562,7 @@
 		};
 
 		serial1: serial@f1930000 {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0 0xf1930000 0 0x1000>;
 			interrupts = <0 26 4>;

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-net-vn-x-b2197-00-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-net-vn-x-b2197-00-reva.dtsi
@@ -84,7 +84,7 @@
 	eeprom0: eeprom@51 {
 		compatible = "st,24c128", "atmel,24c128";
 		reg = <0x51>;
-		u-boot,dm-pre-reloc;
+		bootph-all;
 	};
 };
 
@@ -93,7 +93,7 @@
 	eeprom1: eeprom@55 {
 		compatible = "st,24c128", "atmel,24c128";
 		reg = <0x55>;
-		u-boot,dm-pre-reloc;
+		bootph-all;
 	};
 };
 

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-spp-itr8-cn13940875.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-spp-itr8-cn13940875.dtsi
@@ -37,7 +37,7 @@
 	};
 
 	clk25: clk25 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <25000000>;

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-virt.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-virt.dtsi
@@ -36,7 +36,7 @@
 	};
 
 	clk25: clk25 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "fixed-clock";
 		#clock-cells = <0x0>;
 		clock-frequency = <25000000>;
@@ -88,7 +88,7 @@
 	};
 
 	amba: amba {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "simple-bus";
 		#address-cells = <0x2>;
 		#size-cells = <0x2>;

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-vpk120-revb.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-vpk120-revb.dtsi
@@ -74,7 +74,7 @@
 	eeprom: eeprom@54 { /* u34 - m24128 16kB */
 		compatible = "st,24c128", "atmel,24c128";
 		reg = <0x54>; /* & 0x5c */
-		u-boot,dm-pre-reloc;
+		bootph-all;
 	};
 
 };

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-vpk180-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/versal-vpk180-reva.dtsi
@@ -75,7 +75,7 @@
 	eeprom: eeprom@54 { /* u34 - m24128 16kB */
 		compatible = "st,24c128", "atmel,24c128";
 		reg = <0x54>; /* & 0x5c */
-		u-boot,dm-pre-reloc;
+		bootph-all;
 	};
 };
 

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zc702.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zc702.dtsi
@@ -383,7 +383,7 @@
 };
 
 &qspi {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	is-dual = <0>;
 	num-cs = <1>;
 	flash@0 {
@@ -418,13 +418,13 @@
 };
 
 &sdhci0 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sdhci0_default>;
 };
 
 &uart1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1_default>;
 };

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zc706.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zc706.dtsi
@@ -293,7 +293,7 @@
 };
 
 &qspi {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	is-dual = <1>;
 	num-cs = <2>;
 	flash@0 {
@@ -329,13 +329,13 @@
 };
 
 &sdhci0 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sdhci0_default>;
 };
 
 &uart1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1_default>;
 };

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zedboard.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zedboard.dtsi
@@ -24,7 +24,7 @@
 };
 
 &qspi {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	num-cs = <1>;
 	flash@0 {
 		compatible = "n25q128a11", "jedec,spi-nor";
@@ -58,11 +58,11 @@
 };
 
 &sdhci0 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 };
 
 &uart1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 };
 
 &usb0 {

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm010.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm010.dtsi
@@ -121,7 +121,7 @@
 };
 
 &uart1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	status = "okay";
 };
 

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm011.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm011.dtsi
@@ -82,7 +82,7 @@
 };
 
 &uart1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	status = "okay";
 };
 

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm012.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm012.dtsi
@@ -90,6 +90,6 @@
 };
 
 &uart1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	status = "okay";
 };
diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm013.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynq-zc770-xm013.dtsi
@@ -110,6 +110,6 @@
 };
 
 &uart0 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	status = "okay";
 };
diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-a2197-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-a2197-reva.dtsi
@@ -22,14 +22,14 @@
 };
 
 &i2c0 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	clock-frequency = <400000>;
 	i2c-mux@74 { /* this cover MGT board */
 		compatible = "nxp,pca9548";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		reg = <0x74>;
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		/* FIXME reset connected to SYSCTRL_IIC_MUX0_RESET */
 		i2c@0 {
 			#address-cells = <1>;
@@ -38,22 +38,22 @@
 			/* Use for storing information about SC board */
 			eeprom0: eeprom@50 { /* u96 - 24LC32A - 256B */
 				compatible = "atmel,24c32";
-				u-boot,dm-pre-reloc;
+				bootph-all;
 				reg = <0x50>;
 			};
 		};
 	};
 };
 
 &i2c1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	clock-frequency = <400000>;
 	i2c-mux@74 { /* This cover processor board */
 		compatible = "nxp,pca9548";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		reg = <0x74>;
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		/* FIXME reset connected to SYSCTRL_IIC_MUX0_RESET */
 		i2c@0 {
 			#address-cells = <1>;
@@ -62,7 +62,7 @@
 			/* Use for storing information about SC board */
 			eeprom1: eeprom@50 { /* u96 - 24LC32A - 256B */
 				compatible = "atmel,24c32";
-				u-boot,dm-pre-reloc;
+				bootph-all;
 				reg = <0x50>;
 			};
 		};

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-sc-revb.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-sc-revb.dtsi
@@ -147,7 +147,7 @@
 };
 
 &i2c1 { /* i2c1 MIO 24-25 */
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	clock-frequency = <100000>;
 	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c1_default>;
@@ -159,7 +159,7 @@
 	eeprom: eeprom@54 { /* u34 - m24128 16kB */
 		compatible = "st,24c128", "atmel,24c128";
 		reg = <0x54>; /* & 0x5c */
-		u-boot,dm-pre-reloc;
+		bootph-all;
 	};
 };
 

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-sm-k26-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-sm-k26-reva.dtsi
@@ -247,20 +247,20 @@
 };
 
 &i2c1 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	clock-frequency = <400000>;
 	scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
 	sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
 
 	eeprom: eeprom@50 { /* u46 - also at address 0x58 */
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "st,24c64", "atmel,24c64"; /* st m24c64 */
 		reg = <0x50>;
 		/* WP pin EE_WP_EN connected to slg7x644092@68 */
 	};
 
 	eeprom_cc: eeprom@51 { /* required by spec - also at address 0x59 */
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "st,24c64", "atmel,24c64"; /* st m24c64 */
 		reg = <0x51>;
 	};

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-vp-x-a2785-00-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-vp-x-a2785-00-reva.dtsi
@@ -100,7 +100,7 @@
 };
 
 &uart0 { /* uart0 MIO38-39 */
-	u-boot,dm-pre-reloc;
+	bootph-all;
 };
 
 &gem0 {

diff --git a/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-vpk120-reva.dtsi b/device_tree/data/kernel_dtsi/2024.1/BOARD/zynqmp-vpk120-reva.dtsi
@@ -131,7 +131,7 @@
 };
 
 &uart0 { /* uart0 MIO38-39 */
-	u-boot,dm-pre-reloc;
+	bootph-all;
 };
 
 &gem0 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ @@
     };
     &uart0 { /* uart0 MIO38-39 */
-    	u-boot,dm-pre-reloc;
+    	bootph-all;
     };
     &gem0 {
@@ Expand Down @@