From 843dac9993a481a2f0cecbf04e1de91804c3805c Mon Sep 17 00:00:00 2001 From: Rupesh Tatiya Date: Thu, 1 Dec 2016 14:11:39 +0530 Subject: [PATCH] ARM: dts: msm: Enable bluetooth for wcn3990 on msm8998 interposer Enable various voltage regulators, clocks required to enable bluetooth on msm8998 interposer. CRs-Fixed: 1097035 Change-Id: I9f70b74b7ccfb84fec721dbfa1d838d183419cb9 Signed-off-by: Rupesh Tatiya --- .../msm8998-interposer-msmfalcon-cdp.dtsi | 27 ------------------- .../msm8998-interposer-msmfalcon-mtp.dtsi | 27 ------------------- .../qcom/msm8998-interposer-msmfalcon.dtsi | 19 +++++++++++++ .../dts/qcom/msm8998-interposer-pmfalcon.dtsi | 9 ------- 4 files changed, 19 insertions(+), 63 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi index 437b054a6ad0..292bc07c679a 100644 --- a/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi @@ -12,33 +12,6 @@ #include "msm8998-pinctrl.dtsi" #include "msm8998-camera-sensor-cdp.dtsi" -/ { - bluetooth: bt_wcn3990 { - status = "disabled"; - compatible = "qca,wcn3990"; - qca,bt-vdd-io-supply = <&pm8998_s3>; - qca,bt-vdd-xtal-supply = <&pm8998_s5>; - qca,bt-vdd-core-supply = <&pm8998_l7_pin_ctrl>; - qca,bt-vdd-pa-supply = <&pm8998_l17_pin_ctrl>; - qca,bt-vdd-ldo-supply = <&pm8998_l25_pin_ctrl>; - qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>; - clocks = <&clock_gcc clk_rf_clk2>; - clock-names = "rf_clk2"; - - qca,bt-vdd-io-voltage-level = <1352000 1352000>; - qca,bt-vdd-xtal-voltage-level = <2040000 2040000>; - qca,bt-vdd-core-voltage-level = <1800000 1800000>; - qca,bt-vdd-pa-voltage-level = <1304000 1304000>; - qca,bt-vdd-ldo-voltage-level = <3312000 3312000>; - qca,bt-chip-pwd-voltage-level = <3600000 3600000>; - - qca,bt-vdd-io-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-xtal-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-core-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-pa-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-ldo-current-level = <1>; /* LPM/PFM */ - }; -}; &blsp1_uart3_hs { status = "ok"; diff --git a/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi index e9c64c12c419..9a1e148c46a0 100644 --- a/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi @@ -13,33 +13,6 @@ #include #include "msm8998-pinctrl.dtsi" #include "msm8998-camera-sensor-mtp.dtsi" -/ { - bluetooth: bt_wcn3990 { - status = "disabled"; - compatible = "qca,wcn3990"; - qca,bt-vdd-io-supply = <&pm8998_s3>; - qca,bt-vdd-xtal-supply = <&pm8998_s5>; - qca,bt-vdd-core-supply = <&pm8998_l7_pin_ctrl>; - qca,bt-vdd-pa-supply = <&pm8998_l17_pin_ctrl>; - qca,bt-vdd-ldo-supply = <&pm8998_l25_pin_ctrl>; - qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>; - clocks = <&clock_gcc clk_rf_clk2>; - clock-names = "rf_clk2"; - - qca,bt-vdd-io-voltage-level = <1352000 1352000>; - qca,bt-vdd-xtal-voltage-level = <2040000 2040000>; - qca,bt-vdd-core-voltage-level = <1800000 1800000>; - qca,bt-vdd-pa-voltage-level = <1304000 1304000>; - qca,bt-vdd-ldo-voltage-level = <3312000 3312000>; - qca,bt-chip-pwd-voltage-level = <3600000 3600000>; - - qca,bt-vdd-io-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-xtal-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-core-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-pa-current-level = <1>; /* LPM/PFM */ - qca,bt-vdd-ldo-current-level = <1>; /* LPM/PFM */ - }; -}; &blsp1_uart3_hs { status = "ok"; diff --git a/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi index e57573166b7b..7cf02e09e785 100644 --- a/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi @@ -340,6 +340,25 @@ label = "cont_splash_mem"; }; }; + + bluetooth: bt_wcn3990 { + compatible = "qca,wcn3990"; + qca,bt-vdd-core-supply = <&pmfalcon_l9_pin_ctrl>; + qca,bt-vdd-pa-supply = <&pmfalcon_l6_pin_ctrl>; + qca,bt-vdd-ldo-supply = <&pmfalcon_l19_pin_ctrl>; + qca,bt-chip-pwd-supply = <&pm2falcon_bob_pin1>; + clocks = <&clock_gcc clk_rf_clk1>; + clock-names = "rf_clk1"; + + qca,bt-vdd-core-voltage-level = <1800000 1900000>; + qca,bt-vdd-pa-voltage-level = <1304000 1370000>; + qca,bt-vdd-ldo-voltage-level = <3312000 3400000>; + qca,bt-chip-pwd-voltage-level = <3600000 3600000>; + + qca,bt-vdd-core-current-level = <1>; /* LPM/PFM */ + qca,bt-vdd-pa-current-level = <1>; /* LPM/PFM */ + qca,bt-vdd-ldo-current-level = <1>; /* LPM/PFM */ + }; }; #include "msm8998-smp2p.dtsi" diff --git a/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi index 6ecda1a9548d..fe47565fc1de 100644 --- a/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi @@ -65,15 +65,6 @@ }; -&bluetooth { - /delete-property/qca,bt-vdd-io-supply; - /delete-property/qca,bt-vdd-xtal-supply; - /delete-property/qca,bt-vdd-core-supply; - /delete-property/qca,bt-vdd-pa-supply; - /delete-property/qca,bt-vdd-ldo-supply; - /delete-property/qca,bt-chip-pwd-supply; -}; - &sdhc_2 { /delete-property/vdd-supply; /delete-property/vdd-io-supply;