summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-10 22:49:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-10 22:49:38 -0800
commit896ddc1b329090ec02a777a5d59be8dedd3543a3 (patch)
treeaab86ec2303d623f30ee0a92b1c770c03518c0c8
parentd3939fea72bdcb8fcbe66eb0b2feaf66ef1e2021 (diff)
parent6eaec5943347f8c6bf4c461fe6339c57c7a92a43 (diff)
Merge "ARM: dts: msm: Fix BT current leakage in msmcobalt MTP and CDP"
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi8
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi8
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi
index fd4799f29370..ca504a798659 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi
@@ -17,11 +17,11 @@
compatible = "qca,wcn3990";
qca,bt-vdd-io-supply = <&pmcobalt_s3>;
qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
- qca,bt-vdd-core-supply = <&pmcobalt_l7_pin_ctrl>;
- qca,bt-vdd-pa-supply = <&pmcobalt_l17_pin_ctrl>;
- qca,bt-vdd-ldo-supply = <&pmcobalt_l25_pin_ctrl>;
+ qca,bt-vdd-core-supply = <&pmcobalt_l7>;
+ qca,bt-vdd-pa-supply = <&pmcobalt_l17>;
+ qca,bt-vdd-ldo-supply = <&pmcobalt_l25>;
qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
- clocks = <&clock_gcc clk_rf_clk2>;
+ clocks = <&clock_gcc clk_rf_clk2_pin>;
clock-names = "rf_clk2";
qca,bt-vdd-io-voltage-level = <1352000 1352000>;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi
index 0e8a45b70d97..75de2d70028a 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi
@@ -18,11 +18,11 @@
compatible = "qca,wcn3990";
qca,bt-vdd-io-supply = <&pmcobalt_s3>;
qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
- qca,bt-vdd-core-supply = <&pmcobalt_l7_pin_ctrl>;
- qca,bt-vdd-pa-supply = <&pmcobalt_l17_pin_ctrl>;
- qca,bt-vdd-ldo-supply = <&pmcobalt_l25_pin_ctrl>;
+ qca,bt-vdd-core-supply = <&pmcobalt_l7>;
+ qca,bt-vdd-pa-supply = <&pmcobalt_l17>;
+ qca,bt-vdd-ldo-supply = <&pmcobalt_l25>;
qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
- clocks = <&clock_gcc clk_rf_clk2>;
+ clocks = <&clock_gcc clk_rf_clk2_pin>;
clock-names = "rf_clk2";
qca,bt-vdd-io-voltage-level = <1352000 1352000>;