MLK-14807-2: ARM: dts: imx6: correct all ldo-enable dts

'vin-supply' property used in ldo-bypass mode while 'vin-supply' deleted
in ldo-enable mode on v4.9 rather than dirctly switch 'supply' to internal
regulator and external pmic regulator on v4.1. Correct it for all *-ldo.dts,
otherwise, still work in ldo-bypass mode.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>

diff --git a/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts b/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
index 20af5a9..e5c623d 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
+++ b/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
@@ -8,16 +8,23 @@
 
 #include "imx6dl-sabresd.dts"
 
-&cpu0 {
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
-};
-
 &gpc {
        /* use ldo-enable, u-boot will check it and configure */
        fsl,ldo-bypass = <0>;
 };
 
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_pu {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};
+
 &wdog1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6q-sabresd-ldo.dts b/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
index 55635bf..8363302 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
@@ -8,16 +8,23 @@
 
 #include "imx6q-sabresd.dts"
 
-&cpu0 {
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
-};
-
 &gpc {
        /* use ldo-enable, u-boot will check it and configure */
        fsl,ldo-bypass = <0>;
 };
 
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_pu {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};
+
 &wdog1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts b/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts
index 05d8808..d998c13 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts
+++ b/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts
@@ -8,11 +8,6 @@
 
 #include "imx6qp-sabresd.dts"
 
-&cpu0 {
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
-};
-
 &gpc {
        /* use ldo-enable, u-boot will check it and configure */
        fsl,ldo-bypass = <0>;
@@ -20,6 +15,18 @@
        fsl,wdog-reset = <1>;
 };
 
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_pu {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};
+
 &wdog1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6sl-evk-ldo.dts b/arch/arm/boot/dts/imx6sl-evk-ldo.dts
index 6422e85..a230e21 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk-ldo.dts
+++ b/arch/arm/boot/dts/imx6sl-evk-ldo.dts
@@ -9,12 +9,19 @@
 
 #include "imx6sl-evk.dts"
 
-&cpu0 {
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
-};
-
 &gpc {
        /* use ldo-enable, u-boot will check it and configure */
        fsl,ldo-bypass = <0>;
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_pu {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};

diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-ldo.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-ldo.dts
index 86818a4..b7aeaca 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2-ldo.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-ldo.dts
@@ -8,11 +8,14 @@
 
 #include "imx6sx-19x19-arm2.dts"
 
-&cpu0 {
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
-};
-
 &gpc {
        fsl,ldo-bypass = <0>; /* use ldo-enable, u-boot will check it and configure */
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};

diff --git a/arch/arm/boot/dts/imx6sx-sdb-ldo.dts b/arch/arm/boot/dts/imx6sx-sdb-ldo.dts
index d9b3acc..3a8c194 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb-ldo.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-ldo.dts
@@ -23,11 +23,17 @@
                396000  1175000
                198000  1175000
        >;
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
        fsl,arm-soc-shared = <0>;
 };
 
 &gpc {
        fsl,ldo-bypass = <0>; /* use ldo-enable, u-boot will check it and configure */
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};

diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva-ldo.dts b/arch/arm/boot/dts/imx6sx-sdb-reva-ldo.dts
index c6581f5..8671999 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb-reva-ldo.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-reva-ldo.dts
@@ -8,11 +8,14 @@
 
 #include "imx6sx-sdb-reva.dts"
 
-&cpu0 {
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
-};
-
 &gpc {
        fsl,ldo-bypass = <0>; /* use ldo-enable, u-boot will check it and configure */
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};

diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk-ldo.dts b/arch/arm/boot/dts/imx6ul-9x9-evk-ldo.dts
index 9aba93c..715efcb 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-9x9-evk-ldo.dts
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk-ldo.dts
@@ -23,11 +23,17 @@
                396000  1175000
                198000  1175000
        >;
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
        fsl,arm-soc-shared = <0>;
 };
 
 &gpc {
        fsl,ldo-bypass = <0>; /* use ldo-enable, u-boot will check it and configure */
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};

diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ldo.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ldo.dts
index 735b2ef..4266dc2 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ldo.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ldo.dts
@@ -25,11 +25,17 @@
                396000  1175000
                198000  1175000
        >;
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
        fsl,arm-soc-shared = <0>;
 };
 
 &gpc {
        fsl,ldo-bypass = <0>; /* use ldo-enable, u-boot will check it and configure */
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};

diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk-ldo.dts b/arch/arm/boot/dts/imx6ull-9x9-evk-ldo.dts
index 817f48a..a878fe5 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-9x9-evk-ldo.dts
+++ b/arch/arm/boot/dts/imx6ull-9x9-evk-ldo.dts
@@ -20,11 +20,17 @@
                396000  1175000
                198000  1175000
        >;
-       arm-supply = <&reg_arm>;
-       soc-supply = <&reg_soc>;
        fsl,arm-soc-shared = <0>;
 };
 
 &gpc {
        fsl,ldo-bypass = <0>; /* use ldo-enable, u-boot will check it and configure */
 };
+
+&reg_arm {
+       /delete-property/ vin-supply;
+};
+
+&reg_soc {
+       /delete-property/ vin-supply;
+};