From 0c3613d1074f2cd0c251f760bf52ec54d873f9c2 Mon Sep 17 00:00:00 2001 From: Xiaoning Ma Date: Tue, 23 Feb 2021 15:41:27 +0800 Subject: [PATCH] ARM: dts: msm: add bt power node for sa81x5 add bt power node for sa81x5 and add new bt compatible string for automotive BT SoCS QCA6574/QCA6595/QCA6696. Change-Id: I015e1ab6e6ed2f8ec5ee9c1a659bd351aa7cdad3 --- bindings/bluetooth/btpower.txt | 1 + qcom/sa8155-adp-common.dtsi | 1 + qcom/sa8155-cnss.dtsi | 52 ++++++++++++++++++++++++++++++++++ qcom/sa8195p-adp-common.dtsi | 2 ++ qcom/sa8195p-cnss.dtsi | 50 ++++++++++++++++++++++++++++++++ qcom/sa8195p.dtsi | 3 ++ 6 files changed, 109 insertions(+) create mode 100644 qcom/sa8155-cnss.dtsi create mode 100644 qcom/sa8195p-cnss.dtsi diff --git a/bindings/bluetooth/btpower.txt b/bindings/bluetooth/btpower.txt index 529d764c6da9..648f3a4cf512 100644 --- a/bindings/bluetooth/btpower.txt +++ b/bindings/bluetooth/btpower.txt @@ -11,6 +11,7 @@ Required properties: qcom,qca6390 qcom,qca6490 qcom,wcn6750-bt + qcom,qca-auto-converged - qcom,bt-reset-gpio: GPIO pin to bring BT Controller out of reset - qcom,wl-reset-gpio: GPIO pin for WL_EN toggle diff --git a/qcom/sa8155-adp-common.dtsi b/qcom/sa8155-adp-common.dtsi index d7156a1f25f0..544919ee0573 100644 --- a/qcom/sa8155-adp-common.dtsi +++ b/qcom/sa8155-adp-common.dtsi @@ -2,6 +2,7 @@ #include #include "sa8155-pmic-overlay.dtsi" +#include "sa8155-cnss.dtsi" &qupv3_3 { status = "ok"; diff --git a/qcom/sa8155-cnss.dtsi b/qcom/sa8155-cnss.dtsi new file mode 100644 index 000000000000..c6189b4e6c29 --- /dev/null +++ b/qcom/sa8155-cnss.dtsi @@ -0,0 +1,52 @@ + +&soc { + /* PWR_CTR2_VDD_1P8 supply */ + vreg_conn_1p8: vreg_conn_1p8 { + compatible = "regulator-fixed"; + regulator-name = "vreg_conn_1p8"; + pinctrl-names = "default"; + pinctrl-0 = <&conn_power_1p8_active>; + startup-delay-us = <4000>; + enable-active-high; + gpio = <&tlmm 173 0>; + }; + + /* PWR_CTR1_VDD_PA supply */ + vreg_conn_pa: vreg_conn_pa { + compatible = "regulator-fixed"; + regulator-name = "vreg_conn_pa"; + pinctrl-names = "default"; + pinctrl-0 = <&conn_power_pa_active>; + startup-delay-us = <4000>; + enable-active-high; + gpio = <&tlmm 174 0>; + }; + + bluetooth: bt-qca-auto-converged { + compatible = "qcom,qca-auto-converged"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_active>; + /* BT_EN */ + qcom,bt-reset-gpio = <&tlmm 172 0>; + /* PWR_CTR1_VDD_PA */ + qcom,bt-vdd-ctrl1-supply = <&vreg_conn_pa>; + /* PWR_CTR2_VDD_1P8 */ + qcom,bt-vdd-ctrl2-supply = <&vreg_conn_1p8>; + qcom,bt-vdd-aon-supply = <&pm8150_1_s6>; + qcom,bt-vdd-rfa1-supply = <&pm8150_2_s4>; + qcom,bt-vdd-rfa2-supply = <&pm8150_2_s5>; + qcom,bt-vdd-rfa3-supply = <&pm8150_2_l15>; + + /* */ + qcom,bt-vdd-aon-config = <1055000 1055000 0 0>; + qcom,bt-vdd-rfa1-config = <1370000 1370000 0 0>; + qcom,bt-vdd-rfa2-config = <2040000 2040000 0 0>; + qcom,bt-vdd-rfa3-config = <1900000 1900000 450000 0>; + }; + +}; + +&qupv3_se13_4uart { + status = "ok"; +}; + diff --git a/qcom/sa8195p-adp-common.dtsi b/qcom/sa8195p-adp-common.dtsi index 46f9f966e902..a2e060eacbf6 100644 --- a/qcom/sa8195p-adp-common.dtsi +++ b/qcom/sa8195p-adp-common.dtsi @@ -1,5 +1,7 @@ #include +#include "sa8195p-cnss.dtsi" + &qupv3_3 { status = "ok"; }; diff --git a/qcom/sa8195p-cnss.dtsi b/qcom/sa8195p-cnss.dtsi new file mode 100644 index 000000000000..9739eeb3f339 --- /dev/null +++ b/qcom/sa8195p-cnss.dtsi @@ -0,0 +1,50 @@ + +&soc { + /* PWR_CTR2_VDD_1P8 supply */ + vreg_conn_1p8: vreg_conn_1p8 { + compatible = "regulator-fixed"; + regulator-name = "vreg_conn_1p8"; + pinctrl-names = "default"; + pinctrl-0 = <&conn_power_1p8_active>; + startup-delay-us = <4000>; + enable-active-high; + gpio = <&tlmm 173 0>; + }; + + /* PWR_CTR1_VDD_PA supply */ + vreg_conn_pa: vreg_conn_pa { + compatible = "regulator-fixed"; + regulator-name = "vreg_conn_pa"; + pinctrl-names = "default"; + pinctrl-0 = <&conn_power_pa_active>; + startup-delay-us = <4000>; + enable-active-high; + gpio = <&tlmm 174 0>; + }; + + bluetooth_ext: bt-qca-auto-converged { + compatible = "qcom,qca-auto-converged"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_active>; + /* BT_EN */ + qcom,bt-reset-gpio = <&tlmm 172 0>; + /* PWR_CTR1_VDD_PA */ + qcom,bt-vdd-ctrl1-supply = <&vreg_conn_pa>; + /* PWR_CTR2_VDD_1P8 */ + qcom,bt-vdd-ctrl2-supply = <&vreg_conn_1p8>; + qcom,bt-vdd-aon-supply = <&pm8195_1_s5>; + qcom,bt-vdd-rfa1-supply = <&pm8195_1_s2>; + qcom,bt-vdd-rfa2-supply = <&pm8195_2_l7>; + + /* */ + qcom,bt-vdd-aon-config = <1000000 1000000 0 0>; + qcom,bt-vdd-rfa1-config = <1370000 1370000 0 0>; + qcom,bt-vdd-rfa2-config = <1900000 1900000 450000 0>; + }; + +}; + +&qupv3_se13_4uart { + status = "ok"; +}; + diff --git a/qcom/sa8195p.dtsi b/qcom/sa8195p.dtsi index 3c30056eee9f..13616c51d925 100644 --- a/qcom/sa8195p.dtsi +++ b/qcom/sa8195p.dtsi @@ -8,6 +8,9 @@ model = "Qualcomm Technologies, Inc. SA8195P"; qcom,msm-name = "SA8195P"; qcom,msm-id = <405 0x20000>; + aliases { + hsuart0 = &qupv3_se13_4uart; + }; }; &soc {