[2/2] ARM: dts: nexus7: Add regulator tweaks and wcnss entry to support wifi

Message ID 1494623898-27230-3-git-send-email-john.stultz@linaro.org
State New
Headers show
Series
  • Few DTS changes needed for Nexus7 support
Related show

Commit Message

John Stultz May 12, 2017, 9:18 p.m.
Tweak and add some regulator entries that are needed to
support wifi.

The values here were taken from:
arch/arm/mach-msm/asustek/flo/board-flo-regulator.c
in the AOSP msm 3.4 flo branch.

This also adds a wcnss entry so it gets enabled on the board.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Andy Gross <andy.gross@linaro.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Vinay Simha <simhavcs@gmail.com>
Cc: David Brown <david.brown@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: John Stults <john.stultz@linaro.org>

---
 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 42 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

-- 
2.7.4

Comments

Bjorn Andersson May 13, 2017, 7:19 p.m. | #1
On Fri 12 May 14:18 PDT 2017, John Stultz wrote:

>  				lvs7 {

>  					bias-pull-down;

> +					regulator-always-on;

>  				};


Looking at the downstream regulator definition lvs7 is identified as
"pll_vdd" - which I believe is what Qualcomm abbreviates as "px". It's
supplied by S4 and as such will provide 1.8V to something. So it's quite
likely that I picked the wrong regulator in the dtsi and that this is
the px supply of the wcnss.

Unfortunately I don't have any 8064 device (with wcnss) hooked up and I
can't find any schematics :/

Would you mind changing the riva-pil vddpx-supply to &pm8921_lvs7 and
give this a spin?

Regards,
Bjorn

Patch hide | download patch | download mbox

diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index e5fef32..3cae48f 100644
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -82,7 +82,17 @@ 
 					bias-pull-down;
 				};
 
-				/* msm otg HSUSB_VDDCX */
+				/* wcnss_wlan.0-iris_vddrfa */
+				s2 {
+					regulator-min-microvolt = <1300000>;
+					regulator-max-microvolt = <1300000>;
+					qcom,switch-mode-frequency = <1600000>;
+				};
+
+				/*
+				 * msm otg HSUSB_VDDCX
+				 * wcnss_wlan.0-riva_vddcx
+				 */
 				s3 {
 					regulator-min-microvolt = <500000>;
 					regulator-max-microvolt = <1150000>;
@@ -95,6 +105,7 @@ 
 				 * tabla2x-slim-CDC_VDDA_TX
 				 * tabla2x-slim-CDC_VDD_CP
 				 * tabla2x-slim-VDDIO_CDC
+				 * wcnss_wlan.0-riva_vddpx
 				 */
 				s4 {
 					regulator-min-microvolt	= <1800000>;
@@ -123,7 +134,10 @@ 
 					bias-pull-down;
 				};
 
-				/* msm_otg-HSUSB_1p8 */
+				/*
+				 * msm_otg-HSUSB_1p8
+				 * wcnss_wlan.0-iris_vddxo
+				 */
 				l4 {
 					regulator-min-microvolt = <1800000>;
 					regulator-max-microvolt = <1800000>;
@@ -143,6 +157,12 @@ 
 					regulator-max-microvolt = <2950000>;
 				};
 
+				/* wcnss_wlan.0-iris_vddpa */
+				l10 {
+					regulator-min-microvolt = <2900000>;
+					regulator-max-microvolt = <2900000>;
+				};
+
 				/* mipi_dsi.1-dsi1_avdd */
 				l11 {
 					regulator-min-microvolt = <3000000>;
@@ -165,6 +185,12 @@ 
 					bias-pull-down;
 				};
 
+				/* wcnss_wlan.0-riva_vddmx */
+				l24 {
+					regulator-min-microvolt = <750000>;
+					regulator-max-microvolt = <1150000>;
+				};
+
 				/*
 				 * tabla2x-slim-CDC_VDDA_A_1P2V
 				 * tabla2x-slim-VDDD_CDC_D
@@ -175,10 +201,15 @@ 
 					bias-pull-down;
 				};
 
+				/* wcnss_wlan.0-iris_vddio */
 				lvs1 {
 					bias-pull-down;
 				};
 
+				/* wcnss_wlan.0-iris_vdddig */
+				lvs2 {
+				};
+
 				lvs4 {
 					bias-pull-down;
 				};
@@ -196,6 +227,7 @@ 
 				 */
 				lvs7 {
 					bias-pull-down;
+					regulator-always-on;
 				};
 			};
 		};
@@ -340,6 +372,12 @@ 
 			};
 		};
 
+		riva-pil@3204000 {
+			status = "okay";
+			pinctrl-names = "default";
+			pinctrl-0 = <&riva_wlan_pin_a>;
+		};
+
 		imem@2a03f000 {
 			compatible = "syscon", "simple-mfd";
 			reg = <0x2a03f000 0x1000>;