Skip to contentSkip to conversation

Few DTS changes needed for Nexus7 support

RFC PATCH In review John Stultz 2 participants 5 messages May 12, 2017 – May 14, 2017 Device tree bindings

lore
Share & tools
lore
#0 lore raw

cover Few DTS changes needed for Nexus7 support

Wanted to send out a few dts patches needed to get the usb and wifi mostly working on the 2013 Nexus7(flo).

Still need one code change, to boot, and a few more hacks to get the touch input and wifi totally working.

If anyone is interested, my mainline tracking WIP tree is here:
https://git.linaro.org/people/john.stultz/flo.git/log/?h=flo-WIP

Any thoughts or feedback on these patches would be greatly appreciated!

thanks
-john

Cc Bjorn Andersson <[email protected]>
Cc Srinivas Kandagatla <[email protected]>
Cc Nicolas Dechesne <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Andy Gross <[email protected]>
Cc Rob Clark <[email protected]>
Cc Vinay Simha <[email protected]>
Cc David Brown <[email protected]>
Cc Rob Herring <[email protected]>

John Stultz (1):
ARM: dts: nexus7: Add regulator tweaks and wcnss entry to support wifi

Stephen Boyd (1):
ARM: dts: qcom-apq8064: Collapse usb support into one node

 .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts |  49 +++----
 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts |  63 ++++++---
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |  54 ++++----
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |  54 ++++----
 .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts |  16 +--
 arch/arm/boot/dts/qcom-apq8064.dtsi                | 154 ++++++++++++---------
 6 files changed, 209 insertions(+), 181 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/2 ARM: dts: qcom-apq8064: Collapse usb support into one node

From: Stephen Boyd <[email protected]>

We currently have three device nodes for the same USB hardware block, as evident by the reuse of the same reg address multiple times. Now that the chipidea driver fully supports OTG with the MSM wrapper we can collapse the three nodes into one USB device node, reflecting the true nature of the hardware.

Since we're here, we also mark the irq trigger flags correctly, as IRQ_TYPE_LEVEL_HIGH instead of IRQ_TYPE_NONE.

Cc Bjorn Andersson <[email protected]>
Cc Srinivas Kandagatla <[email protected]>
Cc Nicolas Dechesne <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Andy Gross <[email protected]>
Cc Rob Clark <[email protected]>
Cc Vinay Simha <[email protected]>
Cc David Brown <[email protected]>
Cc Rob Herring <[email protected]>
---
 .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts |  49 +++----
 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts |  21 +--
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |  54 ++++----
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |  54 ++++----
 .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts |  16 +--
 arch/arm/boot/dts/qcom-apq8064.dtsi                | 154 ++++++++++++---------
 6 files changed, 169 insertions(+), 179 deletions(-)
arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts +21 -28
index 8f5de02..c5f561f 100644
@@ -319,44 +319,37 @@
 			target-supply	= <&pm8921_lvs7>;
 		};
 
-		/* OTG */
-		phy@12500000 {
-			status		= "okay";
-			dr_mode		= "peripheral";
-			vddcx-supply	= <&pm8921_s3>;
-			v3p3-supply	= <&pm8921_l3>;
-			v1p8-supply	= <&pm8921_l4>;
-		};
-
-		phy@12520000 {
-			status		= "okay";
-			vddcx-supply	= <&pm8921_s3>;
-			v3p3-supply	= <&pm8921_l3>;
-			v1p8-supply	= <&pm8921_l23>;
-		};
-
-		phy@12530000 {
-			status		= "okay";
-			vddcx-supply	= <&pm8921_s3>;
-			v3p3-supply	= <&pm8921_l3>;
-			v1p8-supply	= <&pm8921_l23>;
-		};
-
-		gadget@12500000 {
-			status = "okay";
-		};
-
-		/* OTG */
 		usb@12500000 {
 			status = "okay";
+			dr_mode = "peripheral";
+			ulpi {
+				phy {
+					v3p3-supply = <&pm8921_l3>;
+					v1p8-supply = <&pm8921_l4>;
+				};
+			};
 		};
 
 		usb@12520000 {
 			status = "okay";
+			dr_mode = "otg";
+			ulpi {
+				phy {
+					v3p3-supply = <&pm8921_l3>;
+					v1p8-supply = <&pm8921_l23>;
+				};
+			};
 		};
 
 		usb@12530000 {
 			status = "okay";
+			dr_mode = "otg";
+			ulpi {
+				phy {
+					v3p3-supply = <&pm8921_l3>;
+					v1p8-supply = <&pm8921_l23>;
+				};
+			};
 		};
 
 		amba {
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts +7 -14
index e39440a..e5fef32 100644
@@ -320,22 +320,15 @@
 			};
 		};
 
-		/* OTG */
-		phy@12500000 {
-			status		= "okay";
-			vddcx-supply	= <&pm8921_s3>;
-			v3p3-supply	= <&pm8921_l3>;
-			v1p8-supply	= <&pm8921_l4>;
-			dr_mode		= "otg";
-		};
-
-		gadget@12500000 {
-			status = "okay";
-		};
-
-		/* OTG */
 		usb@12500000 {
 			status = "okay";
+			dr_mode = "otg";
+			ulpi {
+				phy {
+					v3p3-supply = <&pm8921_l3>;
+					v1p8-supply = <&pm8921_l4>;
+				};
+			};
 		};
 
 		amba {
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts +24 -30

67 lines not on this page · raw message

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +24 -30

67 lines not on this page · raw message

arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts +8 -8
index a34ba35..88a9aff4 100644
@@ -349,15 +349,15 @@
 			};
 		};
 
-		phy@12500000 {
-			status		= "okay";
-			vddcx-supply	= <&pm8921_s3>;
-			v3p3-supply	= <&pm8921_l3>;
-			v1p8-supply	= <&pm8921_l4>;
-		};
-
-		gadget@12500000 {
+		usb@12500000 {
 			status = "okay";
+			dr_mode = "otg";
+			ulpi {
+				phy {
+					v3p3-supply = <&pm8921_l3>;
+					v1p8-supply = <&pm8921_l4>;
+				};
+			};
 		};
 
 		gsbi@1a200000 {
arch/arm/boot/dts/qcom-apq8064.dtsi +85 -69

173 lines not on this page · raw message

Signature · 1 line
2.7.4
Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] ARM: dts: qcom-apq8064: Collapse usb support into one node

Quoted 8 lines · John Stultz

From: Stephen Boyd <[email protected]>

We currently have three device nodes for the same USB hardware block, as evident by the reuse of the same reg address multiple times. Now that the chipidea driver fully supports OTG with the MSM wrapper we can collapse the three nodes into one USB device node, reflecting the true nature of the hardware.

Quoted 4 lines

Since we're here, we also mark the irq trigger flags correctly, as IRQ_TYPE_LEVEL_HIGH instead of IRQ_TYPE_NONE.

Cc Bjorn Andersson <[email protected]>

Regards,
Bjorn

#3 lore raw

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

In reply to John Stultz

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 <[email protected]>
Cc Srinivas Kandagatla <[email protected]>
Cc Nicolas Dechesne <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Andy Gross <[email protected]>
Cc Rob Clark <[email protected]>
Cc Vinay Simha <[email protected]>
Cc David Brown <[email protected]>
Cc Rob Herring <[email protected]>
---
 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 42 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts +40 -2
index e5fef32..3cae48f 100644
@@ -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>;
Signature · 1 line
2.7.4
#4 lore raw

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

arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts line 231

Quoted 4 lines · John Stultz
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts +1 -0
 				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