ENGR00331450-4: ARM: dts: imx6q/dl: add ldo-bypass support

Add ldo-bypass support on imx6q/dl. Currently, we use ldo-bypass
mode on imx6qdl-sabresd board, and ldo-enabled mode on imx6dl-sabre
auto board.

Signed-off-by: Robin Gong <b38343@freescale.com>

diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts
index 3ade18b4fa59f672ce15ab4457bc49d7a56e3866..e9e87462690967b157c668205d931c1003fd6d21 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-sabresd.dts
+++ b/arch/arm/boot/dts/imx6dl-sabresd.dts
@@ -22,6 +22,11 @@
        offset-usb-charger = <1285>;
 };
 
+&cpu0 {
+       arm-supply = <&sw1a_reg>;
+       soc-supply = <&sw1c_reg>;
+};
+
 &i2c2 {
        pmic: pfuze100@08 {
                compatible = "fsl,pfuze100";

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 6c3dcb3564b0b1153bcc0c2885f5d6d8326f0936..6ea988bfe3c957fcd6ac23e401303fb25790fe29 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -17,7 +17,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu@0 {
+               cpu0: cpu@0 {
                        compatible = "arm,cortex-a9";
                        device_type = "cpu";
                        reg = <0>;

diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
index 4f17cb58ed9f7d3e6c92a99c0eaaa82f2e8c1508..2e4fd0bf90b51ac112161b49616702791eda1456 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabresd.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd.dts
@@ -26,6 +26,11 @@
        offset-usb-charger = <1685>;
 };
 
+&cpu0 {
+       arm-supply = <&sw1a_reg>;
+       soc-supply = <&sw1c_reg>;
+};
+
 &i2c2 {
        pmic: pfuze100@08 {
                compatible = "fsl,pfuze100";

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 880cacf9f20cd7dde306074273d44b56d2851500..382f83522306bf0b76d4b2a1dd27b93d9c1200a4 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -21,7 +21,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu@0 {
+               cpu0: cpu@0 {
                        compatible = "arm,cortex-a9";
                        device_type = "cpu";
                        reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 9895a66ef7ec7557a504e05aa7b17de66713ca4e..ec76160b2758deb3dc5d109bab365ec23cf9c2cd 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -554,6 +554,11 @@
        status = "okay";
 };
 
+&gpc {
+       /* use ldo-bypass, u-boot will check it and configure */
+       fsl,ldo-bypass = <1>;
+};
+
 &hdmi_audio {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 2b95f6b0b7d86267b2b317b724189af5cf47b86a..6e15c25f12beecaefd0f759960cd9ba581233203 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -608,6 +608,7 @@
                                        anatop-min-bit-val = <1>;
                                        anatop-min-voltage = <725000>;
                                        anatop-max-voltage = <1450000>;
+                                       regulator-allow-bypass;
                                };
 
                                reg_pu: regulator-vddpu@140 {
@@ -626,6 +627,7 @@
                                        anatop-min-bit-val = <1>;
                                        anatop-min-voltage = <725000>;
                                        anatop-max-voltage = <1450000>;
+                                       regulator-allow-bypass;
                                };
 
                                reg_soc: regulator-vddsoc@140 {
@@ -643,6 +645,7 @@
                                        anatop-min-bit-val = <1>;
                                        anatop-min-voltage = <725000>;
                                        anatop-max-voltage = <1450000>;
+                                       regulator-allow-bypass;
                                };
                        };