From 8b850246cb46f2068677469e31b18fd9b9e8079b Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Sun, 9 Feb 2020 21:35:33 -0800 Subject: [PATCH 1/2] ARM: dts: msm: Add WLAN updates to HSP DTSI overlays Add WLAN dtsi overlays for HSP devices with SW_CTRL connected to incorrect GPIO. Also enable RF_CLK3 for this configuration. Change-Id: Ic10421047af7532f7835e718d50cf279176021f0 --- qcom/lahaina-mtp-hsp.dtsi | 12 ++++++++++++ qcom/lahaina-qrd-hsp.dtsi | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/qcom/lahaina-mtp-hsp.dtsi b/qcom/lahaina-mtp-hsp.dtsi index af2a598d00ab..80a069eeeb91 100644 --- a/qcom/lahaina-mtp-hsp.dtsi +++ b/qcom/lahaina-mtp-hsp.dtsi @@ -1 +1,13 @@ #include "lahaina-mtp.dtsi" +#include + +&wlan { + qcom,vdd-wlan-aon-config = <950000 952000 0 0 0>; + qcom,vdd-wlan-dig-config = <950000 952000 0 0 0>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>; + qcom,vdd-wlan-rfa1-config = <1880000 1880000 0 0 0>; + qcom,vdd-wlan-rfa2-config = <1256000 1256000 0 0 0>; + + clocks = <&clock_rpmh RPMH_RF_CLK3>; + clock-names = "rf_clk"; +}; diff --git a/qcom/lahaina-qrd-hsp.dtsi b/qcom/lahaina-qrd-hsp.dtsi index 74843fc49873..fbeb4a810c46 100644 --- a/qcom/lahaina-qrd-hsp.dtsi +++ b/qcom/lahaina-qrd-hsp.dtsi @@ -1 +1,13 @@ #include "lahaina-qrd.dtsi" +#include + +&wlan { + qcom,vdd-wlan-aon-config = <950000 952000 0 0 0>; + qcom,vdd-wlan-dig-config = <950000 952000 0 0 0>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>; + qcom,vdd-wlan-rfa1-config = <1880000 1880000 0 0 0>; + qcom,vdd-wlan-rfa2-config = <1256000 1256000 0 0 0>; + + clocks = <&clock_rpmh RPMH_RF_CLK3>; + clock-names = "rf_clk"; +}; From ffd5c8d97bfefc05d580c9c3596d83607c326b58 Mon Sep 17 00:00:00 2001 From: Mahesh Sharma Date: Mon, 10 Feb 2020 11:10:41 -0800 Subject: [PATCH 2/2] ARM: dts: msm: Add fix for SW_CTRL mapped to wrong GPIO66 on MSM side GPIO66 is mapped wrongly on MSM side causing SW_CTRL not able to send signal to go clock ON. Fix is to overlay default configuration by adding new changes which votes for RPMH_RF_CLK3 and disables retention mode. Change-Id: I05414d92979c6eb5fe437683711ebf76ef2a8e86 --- qcom/lahaina-mtp-hsp.dtsi | 9 +++++++++ qcom/lahaina-qrd-hsp.dtsi | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/qcom/lahaina-mtp-hsp.dtsi b/qcom/lahaina-mtp-hsp.dtsi index 80a069eeeb91..a325b4dc53b3 100644 --- a/qcom/lahaina-mtp-hsp.dtsi +++ b/qcom/lahaina-mtp-hsp.dtsi @@ -11,3 +11,12 @@ clocks = <&clock_rpmh RPMH_RF_CLK3>; clock-names = "rf_clk"; }; + +&bluetooth { + qcom,bt-vdd-aon-config = <950000 950000 0 0>; + qcom,bt-vdd-dig-config = <950000 950000 0 0>; + qcom,bt-vdd-rfa1-config = <1900000 1900000 0 0>; + qcom,bt-vdd-rfa2-config = <1256000 1256000 0 0>; + clocks = <&clock_rpmh RPMH_RF_CLK3>; + clock-names = "ref3_clk"; +}; diff --git a/qcom/lahaina-qrd-hsp.dtsi b/qcom/lahaina-qrd-hsp.dtsi index fbeb4a810c46..ec6b4aa070c5 100644 --- a/qcom/lahaina-qrd-hsp.dtsi +++ b/qcom/lahaina-qrd-hsp.dtsi @@ -11,3 +11,12 @@ clocks = <&clock_rpmh RPMH_RF_CLK3>; clock-names = "rf_clk"; }; + +&bluetooth { + qcom,bt-vdd-aon-config = <950000 950000 0 0>; + qcom,bt-vdd-dig-config = <950000 950000 0 0>; + qcom,bt-vdd-rfa1-config = <1900000 1900000 0 0>; + qcom,bt-vdd-rfa2-config = <1256000 1256000 0 0>; + clocks = <&clock_rpmh RPMH_RF_CLK3>; + clock-names = "ref3_clk"; +};