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.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi b/arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi
index 3439737..edbee7d 100644
--- a/arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi
+++ b/arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi
@@ -21,13 +21,13 @@
cpus {
compatible = "cpu_bus";
- u-boot,dm-pre-reloc;
+ bootph-all;
PowerPC,8308@0 {
compatible = "fsl,mpc8308";
clocks = <&socclocks MPC83XX_CLK_CORE
&socclocks MPC83XX_CLK_CSB>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -66,7 +66,7 @@
socclocks: clocks {
compatible = "fsl,mpc8308-clk";
#clock-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
timer {
@@ -178,11 +178,11 @@
};
&board_soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
clocks = <&socclocks MPC83XX_CLK_CSB>;
memory@2000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
sdhc@2e000 {
@@ -228,21 +228,21 @@
};
&board_soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&GPIO_VB0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&serial0 {
clocks = <&socclocks MPC83XX_CLK_CSB>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&serial1 {
clocks = <&socclocks MPC83XX_CLK_CSB>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pci0 {
diff --git a/arch/powerpc/dts/km8321-uboot.dtsi b/arch/powerpc/dts/km8321-uboot.dtsi
index fd11fe6..7e776f8 100644
--- a/arch/powerpc/dts/km8321-uboot.dtsi
+++ b/arch/powerpc/dts/km8321-uboot.dtsi
@@ -8,9 +8,9 @@
/ {
cpus {
- u-boot,dm-pre-reloc;
+ bootph-all;
PowerPC,8321@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -29,39 +29,39 @@
&serial0 {
clock-frequency = <132000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
par_io@1400 {
compatible = "fsl,mpc8360-par_io";
- u-boot,dm-pre-reloc;
+ bootph-all;
serial_pin@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@6 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/powerpc/dts/km836x-uboot.dtsi b/arch/powerpc/dts/km836x-uboot.dtsi
index 5c78529..50c886b 100644
--- a/arch/powerpc/dts/km836x-uboot.dtsi
+++ b/arch/powerpc/dts/km836x-uboot.dtsi
@@ -8,9 +8,9 @@
/ {
cpus {
- u-boot,dm-pre-reloc;
+ bootph-all;
PowerPC,8360@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -24,38 +24,38 @@
};
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
par_io@1400 {
- u-boot,dm-pre-reloc;
+ bootph-all;
serial_pin@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@6 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ucc_pin@7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&serial0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi
index d027762..b26e240 100644
--- a/arch/powerpc/dts/kmcent2-u-boot.dtsi
+++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi
@@ -24,7 +24,7 @@
};
soc@ffe000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
spi@110000 {
/* This documents where km_fpgacfg should be appear */
fpga@0 {
@@ -39,7 +39,7 @@
};
i2c@118000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
mux@70 {
i2c@1 { /* IVM bus */
reg = <1>;
@@ -50,7 +50,7 @@
};
serial@11c500 {
- u-boot,dm-pre-reloc;
+ bootph-all;
clock-frequency = <200000000>;
};
diff --git a/arch/powerpc/dts/pq3-i2c-0.dtsi b/arch/powerpc/dts/pq3-i2c-0.dtsi
index 0ed519c..a838bd9 100644
--- a/arch/powerpc/dts/pq3-i2c-0.dtsi
+++ b/arch/powerpc/dts/pq3-i2c-0.dtsi
@@ -9,7 +9,7 @@
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x3000 0x100>;
interrupts = <43 2 0 0>;
dfsrr;
diff --git a/arch/powerpc/dts/pq3-i2c-1.dtsi b/arch/powerpc/dts/pq3-i2c-1.dtsi
index 78b0fcf..96cd009 100644
--- a/arch/powerpc/dts/pq3-i2c-1.dtsi
+++ b/arch/powerpc/dts/pq3-i2c-1.dtsi
@@ -9,7 +9,7 @@
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x3100 0x100>;
interrupts = <43 2 0 0>;
dfsrr;
diff --git a/arch/powerpc/dts/qoriq-i2c-0.dtsi b/arch/powerpc/dts/qoriq-i2c-0.dtsi
index 9d0ab88..7fb09e0 100644
--- a/arch/powerpc/dts/qoriq-i2c-0.dtsi
+++ b/arch/powerpc/dts/qoriq-i2c-0.dtsi
@@ -9,7 +9,7 @@
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x118000 0x100>;
interrupts = <38 2 0 0>;
};
@@ -19,7 +19,7 @@
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x118100 0x100>;
interrupts = <38 2 0 0>;
};
diff --git a/arch/powerpc/dts/qoriq-i2c-1.dtsi b/arch/powerpc/dts/qoriq-i2c-1.dtsi
index de0a22e..f469abc 100644
--- a/arch/powerpc/dts/qoriq-i2c-1.dtsi
+++ b/arch/powerpc/dts/qoriq-i2c-1.dtsi
@@ -9,7 +9,7 @@
#size-cells = <0>;
cell-index = <2>;
compatible = "fsl-i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x119000 0x100>;
interrupts = <39 2 0 0>;
};
@@ -19,7 +19,7 @@
#size-cells = <0>;
cell-index = <3>;
compatible = "fsl-i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x119100 0x100>;
interrupts = <39 2 0 0>;
};
diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi
index 88df031..c2a28ea 100644
--- a/arch/powerpc/dts/socrates-u-boot.dtsi
+++ b/arch/powerpc/dts/socrates-u-boot.dtsi
@@ -16,7 +16,7 @@
soc8544@e0000000 {
i2c@3000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
i2c_eeprom0: eeprom@51{
compatible = "atmel,24c64";
@@ -34,7 +34,7 @@
};
&serial0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
clock-frequency = <333333330>;
};