[PATCH 2/5] dm: doc: Update device tree binding docs for new schema

Simon Glass sjg at chromium.org
Fri Jan 20 00:26:54 CET 2023


Now that Linux has accepted these tags, move U-Boot over to use them.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 doc/device-tree-bindings/chosen.txt           |  2 +-
 .../clock/rockchip,rk3368-dmc.txt             |  2 +-
 .../clock/rockchip,rk3399-dmc.txt             |  2 +-
 .../clock/st,stm32mp1.txt                     | 22 +++++++++----------
 doc/device-tree-bindings/device.txt           |  6 ++---
 .../fsp/fsp2/apollolake/fsp-s.txt             |  2 +-
 .../memory-controller/k3-j721e-ddrss.txt      |  2 +-
 .../memory-controllers/k3-am654-ddrss.txt     |  2 +-
 doc/device-tree-bindings/misc/fs_loader.txt   |  8 +++----
 doc/device-tree-bindings/net/mdio-mux-reg.txt |  2 +-
 doc/device-tree-bindings/pci/x86-pci.txt      |  4 ++--
 .../pinctrl/nexell,s5pxx18-pinctrl.txt        |  2 +-
 .../ram/fsl,mpc83xx-mem-controller.txt        |  2 +-
 .../video/atmel-hlcdc.txt                     |  2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/doc/device-tree-bindings/chosen.txt b/doc/device-tree-bindings/chosen.txt
index e5ba6720ce1..c8312540f57 100644
--- a/doc/device-tree-bindings/chosen.txt
+++ b/doc/device-tree-bindings/chosen.txt
@@ -129,7 +129,7 @@ Example
 	};
 
 	fs_loader0: fs-loader at 0 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "u-boot,fs-loader";
 		phandlepart = <&mmc 1>;
 	};
diff --git a/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt b/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
index 8e7357d53d3..da474fbabde 100644
--- a/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
+++ b/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
@@ -54,7 +54,7 @@ Example (for DDR3-1600K and 800MHz)
 	#include <dt-bindings/memory/rk3368-dmc.h>
 
 	dmc: dmc at ff610000 {
-	        u-boot,dm-pre-reloc;
+	        bootph-all;
 		compatible = "rockchip,rk3368-dmc";
 		reg = <0 0xff610000 0 0x400
 		       0 0xff620000 0 0x400>;
diff --git a/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt b/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
index a15dc5d1f85..4a56f78f555 100644
--- a/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
+++ b/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
@@ -16,7 +16,7 @@ Required properties:
 
 Example:
 	dmc: dmc {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "rockchip,rk3399-dmc";
 		devfreq-events = <&dfi>;
 		interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
diff --git a/doc/device-tree-bindings/clock/st,stm32mp1.txt b/doc/device-tree-bindings/clock/st,stm32mp1.txt
index 4d4136d2fce..e638bcef7bc 100644
--- a/doc/device-tree-bindings/clock/st,stm32mp1.txt
+++ b/doc/device-tree-bindings/clock/st,stm32mp1.txt
@@ -251,9 +251,9 @@ Example of clock tree initialization
 
 / {
 	clocks {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		clk_hse: clk-hse {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <24000000>;
@@ -261,28 +261,28 @@ Example of clock tree initialization
 		};
 
 		clk_hsi: clk-hsi {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <64000000>;
 		};
 
 		clk_lse: clk-lse {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <32768>;
 		};
 
 		clk_lsi: clk-lsi {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <32000>;
 		};
 
 		clk_csi: clk-csi {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <4000000>;
@@ -292,7 +292,7 @@ Example of clock tree initialization
 	soc {
 
 		rcc: rcc at 50000000 {
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			compatible = "st,stm32mp1-rcc", "syscon";
 			reg = <0x50000000 0x1000>;
 			#address-cells = <1>;
@@ -371,7 +371,7 @@ Example of clock tree initialization
 				reg = <0>;
 				cfg = < 2 80 0 0 0 PQR(1,0,0) >;
 				frac = < 0x800 >;
-				u-boot,dm-pre-reloc;
+				bootph-all;
 			};
 
 			/* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU),
@@ -381,7 +381,7 @@ Example of clock tree initialization
 				reg = <1>;
 				cfg = < 2 65 1 0 0 PQR(1,1,1) >;
 				frac = < 0x1400 >;
-				u-boot,dm-pre-reloc;
+				bootph-all;
 			};
 
 			/* VCO = 417.8 MHz => P = 209, Q = 24, R = 11 */
@@ -390,7 +390,7 @@ Example of clock tree initialization
 				reg = <2>;
 				cfg = < 1 33 1 16 36 PQR(1,1,1) >;
 				frac = < 0x1a04 >;
-				u-boot,dm-pre-reloc;
+				bootph-all;
 			};
 
 			/* VCO = 594.0 MHz => P = 99, Q = 74, R = 74 */
@@ -398,7 +398,7 @@ Example of clock tree initialization
 				compatible = "st,stm32mp1-pll";
 				reg = <3>;
 				cfg = < 3 98 5 7 7 PQR(1,1,1) >;
-				u-boot,dm-pre-reloc;
+				bootph-all;
 			};
 		};
 	};
diff --git a/doc/device-tree-bindings/device.txt b/doc/device-tree-bindings/device.txt
index 73ce2a3b5b5..ef4f219e91d 100644
--- a/doc/device-tree-bindings/device.txt
+++ b/doc/device-tree-bindings/device.txt
@@ -54,7 +54,7 @@ pcie-a0 at 14,0 {
 };
 
 p2sb: p2sb at d,0 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	reg = <0x02006810 0 0 0 0>;
 	compatible = "intel,apl-p2sb";
 	early-regs = <IOMAP_P2SB_BAR 0x100000>;
@@ -62,12 +62,12 @@ p2sb: p2sb at d,0 {
 
 	n {
 		compatible = "intel,apl-pinctrl";
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		intel,p2sb-port-id = <PID_GPIO_N>;
 		acpi,path = "\\_SB.GPO0";
 		gpio_n: gpio-n {
 			compatible = "intel,gpio";
-			u-boot,dm-pre-reloc;
+			bootph-all;
 			gpio-controller;
 			#gpio-cells = <2>;
 			linux-name = "INT3452:00";
diff --git a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
index dc8e3251a37..33386ebd385 100644
--- a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
+++ b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
@@ -474,7 +474,7 @@ Optional properties:
 Example:
 
 &fsp_s {
-	u-boot,dm-pre-proper;
+	bootph-some-ram;
 
 	fsps,ish-enable = <0>;
 	fsps,enable-sata = <0>;
diff --git a/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt b/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
index 1ea0a701143..2e41096aa62 100644
--- a/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
+++ b/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
@@ -57,7 +57,7 @@ memorycontroller: memorycontroller at 0298e000 {
 	ti,ddr-freq2 = <DDRSS_PLL_FREQUENCY_2>;
 	ti,ddr-fhs-cnt = <DDRSS_PLL_FHS_CNT>;
 
-	u-boot,dm-spl;
+	bootph-pre-ram;
 
 	ti,ctl-data = <
 		DDRSS_CTL_00_DATA
diff --git a/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
index 1e11edf7b19..792560a323a 100644
--- a/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
+++ b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
@@ -42,5 +42,5 @@ Example (AM65x):
 			reg-names = "ss", "ctl", "phy";
 			clocks = <&k3_clks 20 0>;
 			power-domains = <&k3_pds 20>;
-			u-boot,dm-spl;
+			bootph-pre-ram;
 		};
diff --git a/doc/device-tree-bindings/misc/fs_loader.txt b/doc/device-tree-bindings/misc/fs_loader.txt
index 884fbf47c0b..542be4b25a0 100644
--- a/doc/device-tree-bindings/misc/fs_loader.txt
+++ b/doc/device-tree-bindings/misc/fs_loader.txt
@@ -20,28 +20,28 @@ ubi in device tree source as shown in below:
 	sata and ubi as shown in below:
 	Example for mmc:
 	fs_loader0: fs-loader at 0 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "u-boot,fs-loader";
 		phandlepart = <&mmc_0 1>;
 	};
 
 	Example for usb:
 	fs_loader1: fs-loader at 1 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "u-boot,fs-loader";
 		phandlepart = <&usb0 1>;
 	};
 
 	Example for sata:
 	fs_loader2: fs-loader at 2 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "u-boot,fs-loader";
 		phandlepart = <&sata0 1>;
 	};
 
 	Example for ubi:
 	fs_loader3: fs-loader at 3 {
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "u-boot,fs-loader";
 		mtdpart = "UBI",
 		ubivol = "ubi0";
diff --git a/doc/device-tree-bindings/net/mdio-mux-reg.txt b/doc/device-tree-bindings/net/mdio-mux-reg.txt
index 0ac34dc423a..0f7c2956877 100644
--- a/doc/device-tree-bindings/net/mdio-mux-reg.txt
+++ b/doc/device-tree-bindings/net/mdio-mux-reg.txt
@@ -16,7 +16,7 @@ Example structure, used on Freescale LS1028A QDS board:
 
 &i2c0 {
 	status = "okay";
-	u-boot,dm-pre-reloc;
+	bootph-all;
 
 	fpga at 66 {
 		#address-cells = <1>;
diff --git a/doc/device-tree-bindings/pci/x86-pci.txt b/doc/device-tree-bindings/pci/x86-pci.txt
index cf4e5ed595a..e6d4b375353 100644
--- a/doc/device-tree-bindings/pci/x86-pci.txt
+++ b/doc/device-tree-bindings/pci/x86-pci.txt
@@ -31,7 +31,7 @@ pci {
 	compatible = "pci-x86";
 	#address-cells = <3>;
 	#size-cells = <2>;
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0 0x10000000
 		0x42000000 0x0 0xb0000000 0xb0000000 0 0x10000000
 		0x01000000 0x0 0x1000 0x1000 0 0xefff>;
@@ -41,7 +41,7 @@ pci {
 
 	serial: serial at 18,2 {
 		reg = <0x0200c210 0 0 0 0>;
-		u-boot,dm-pre-reloc;
+		bootph-all;
 		compatible = "intel,apl-ns16550";
 		early-regs = <0xde000000 0x20>;
 		reg-shift = <2>;
diff --git a/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt b/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt
index 115ab53a4cd..38e322db81c 100644
--- a/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt
@@ -20,7 +20,7 @@ Example:
 pinctrl_0: pinctrl at c0010000 {
 	compatible = "nexell,s5pxx18-pinctrl";
 		reg = <0xc0010000 0xf000>;
-		u-boot,dm-pre-reloc;
+		bootph-all;
 };
 
 Nexell's pin configuration nodes act as a container for an arbitrary number of
diff --git a/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt b/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
index da01fe908de..de498aca784 100644
--- a/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
+++ b/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
@@ -249,7 +249,7 @@ memory at 2000 {
 	compatible = "fsl,mpc83xx-mem-controller";
 	reg = <0x2000 0x1000>;
 	device_type = "memory";
-	u-boot,dm-pre-reloc;
+	bootph-all;
 
 	driver_software_override = <DSO_ENABLE>;
 	p_impedance_override = <DSO_P_IMPEDANCE_NOMINAL>;
diff --git a/doc/device-tree-bindings/video/atmel-hlcdc.txt b/doc/device-tree-bindings/video/atmel-hlcdc.txt
index b378cbf9de8..7c9441ae8b3 100644
--- a/doc/device-tree-bindings/video/atmel-hlcdc.txt
+++ b/doc/device-tree-bindings/video/atmel-hlcdc.txt
@@ -15,7 +15,7 @@ Required properties:
 
 Example:
 hlcdc: hlcdc at f0000000 {
-	u-boot,dm-pre-reloc;
+	bootph-all;
 	compatible = "atmel,sama5d2-hlcdc";
 	reg = <0xf0000000 0x2000>;
 	clocks = <&lcdc_clk>;
-- 
2.39.0.246.g2a6d74b583-goog



More information about the U-Boot mailing list