Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1567841 > unrolled thread

[PATCH 0/5] Updated qcom dts for new USB driver

Started byStephen Boyd <stephen.boyd@linaro.org>
First post2017-01-27 01:50 +0100
Last post2017-01-27 01:50 +0100
Articles 4 — 1 participant

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/5] Updated qcom dts for new USB driver Stephen Boyd <stephen.boyd@linaro.org> - 2017-01-27 01:50 +0100
    [PATCH 2/5] ARM: dts: qcom: add charger otg regulator Stephen Boyd <stephen.boyd@linaro.org> - 2017-01-27 01:50 +0100
    [PATCH 1/5] ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control Stephen Boyd <stephen.boyd@linaro.org> - 2017-01-27 01:50 +0100
    [PATCH 5/5] arm64: dts: qcom: Collapse usb support into one node Stephen Boyd <stephen.boyd@linaro.org> - 2017-01-27 01:50 +0100

#1567841 — [PATCH 0/5] Updated qcom dts for new USB driver

FromStephen Boyd <stephen.boyd@linaro.org>
Date2017-01-27 01:50 +0100
Subject[PATCH 0/5] Updated qcom dts for new USB driver
Message-ID<t42TM-5O4-3@gated-at.bofh.it>
This set of patches updates the existing usb chipidea bindings
for the newly merged usb driver. It allows us to move
away from the split ehci-msm and ci_hdrc_msm drivers, and unify
them with one chipidea driver.

I've left out HSIC, so it can be sent seperately.

Bird, Tim (1):
  ARM: dts: qcom: add charger otg regulator

Stephen Boyd (4):
  ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control
  ARM: dts: qcom-msm8974: Add HS usb node and OTG detection mechanisms
  ARM: dts: qcom-apq8064: Collapse usb support into one node
  arm64: dts: qcom: 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 |  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                | 156 ++++++++++++---------
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts     |  20 +++
 .../boot/dts/qcom-msm8974-sony-xperia-honami.dts   |   1 -
 arch/arm/boot/dts/qcom-msm8974.dtsi                |  53 ++++++-
 arch/arm/boot/dts/qcom-pm8941.dtsi                 |  36 ++++-
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |  34 ++---
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |  62 ++++----
 12 files changed, 321 insertions(+), 235 deletions(-)

-- 
2.10.0.297.gf6727b0

[toc] | [next] | [standalone]

#1567843 — [PATCH 2/5] ARM: dts: qcom: add charger otg regulator

FromStephen Boyd <stephen.boyd@linaro.org>
Date2017-01-27 01:50 +0100
Subject[PATCH 2/5] ARM: dts: qcom: add charger otg regulator
Message-ID<t42TM-5O4-11@gated-at.bofh.it>
In reply to#1567841
From: "Bird, Tim" <Tim.Bird@sonymobile.com>

Add the otg regulator provided by the charger block.

Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
[stephen.boyd@linaro.org: Fix otg supply property name]
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
---
 arch/arm/boot/dts/qcom-pm8941.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index f8eb5e31c920..6b16b296f0fa 100644
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -45,6 +45,10 @@
 					  "chg-gone",
 					  "usb-valid",
 					  "dc-valid";
+
+			usb-otg-in-supply = <&pm8941_5vs1>;
+
+			chg_otg: otg-vbus { };
 		};
 
 		pm8941_gpios: gpios@c000 {
-- 
2.10.0.297.gf6727b0

[toc] | [prev] | [next] | [standalone]

#1567844 — [PATCH 1/5] ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control

FromStephen Boyd <stephen.boyd@linaro.org>
Date2017-01-27 01:50 +0100
Subject[PATCH 1/5] ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control
Message-ID<t42TM-5O4-17@gated-at.bofh.it>
In reply to#1567841
These regulators are controlled by the SPMI regulator driver
instead of the RPM regulator driver in the downstream android
kernel sources. Let's remove them from the DTS here because
they'll never be used by the RPM regulator driver.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
---
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 -
 arch/arm/boot/dts/qcom-msm8974.dtsi                   | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
index e7c1577d56f4..50966378f9e4 100644
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
@@ -92,7 +92,6 @@
 					vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
 					vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
 					vdd_l21-supply = <&vreg_boost>;
-					vin_5vs-supply = <&pm8941_5v>;
 
 					s1 {
 						regulator-min-microvolt = <1300000>;
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 0e9bbede860d..6c167c031368 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -735,7 +735,6 @@
 					pm8941_s1: s1 {};
 					pm8941_s2: s2 {};
 					pm8941_s3: s3 {};
-					pm8941_5v: s4 {};
 
 					pm8941_l1: l1 {};
 					pm8941_l2: l2 {};
@@ -765,9 +764,6 @@
 					pm8941_lvs1: lvs1 {};
 					pm8941_lvs2: lvs2 {};
 					pm8941_lvs3: lvs3 {};
-
-					pm8941_5vs1: 5vs1 {};
-					pm8941_5vs2: 5vs2 {};
 				};
 			};
 		};
-- 
2.10.0.297.gf6727b0

[toc] | [prev] | [next] | [standalone]

#1567845 — [PATCH 5/5] arm64: dts: qcom: Collapse usb support into one node

FromStephen Boyd <stephen.boyd@linaro.org>
Date2017-01-27 01:50 +0100
Subject[PATCH 5/5] arm64: dts: qcom: Collapse usb support into one node
Message-ID<t42TM-5O4-19@gated-at.bofh.it>
In reply to#1567841
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 all these nodes into one USB device
node, reflecting the true nature of the hardware.

Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
---
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 34 +++++++++--------
 arch/arm64/boot/dts/qcom/msm8916.dtsi     | 62 +++++++++++++++----------------
 2 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 08bd5ebafb4e..a9506619dfff 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -201,22 +201,16 @@
 		usb@78d9000 {
 			extcon = <&usb_id>, <&usb_id>;
 			status = "okay";
-		};
-
-		ehci@78d9000 {
-			status = "okay";
-		};
-
-		phy@78d9000 {
-			v1p8-supply = <&pm8916_l7>;
-			v3p3-supply = <&pm8916_l13>;
-			vddcx-supply = <&pm8916_s1>;
-			extcon = <&usb_id>, <&usb_id>;
-			dr_mode = "otg";
-			status = "okay";
-			switch-gpio = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&usb_sw_sel_pm>;
+			adp-disable;
+			hnp-disable;
+			srp-disable;
+			ulpi {
+				phy {
+					v1p8-supply = <&pm8916_l7>;
+					v3p3-supply = <&pm8916_l13>;
+					extcon = <&usb_id>;
+				};
+			};
 		};
 
 		lpass@07708000 {
@@ -321,6 +315,14 @@
 		pinctrl-0 = <&usb_id_default>;
 	};
 
+	usb-switch {
+		compatible = "toshiba,tc7usb40mu";
+		switch-gpios = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>;
+		extcon = <&usb_id>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb_sw_sel_pm>;
+	};
+
 	hdmi-out {
 		compatible = "hdmi-connector";
 		type = "a";
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index f8ff327667c5..5066fb23ed98 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -545,44 +545,40 @@
 			status = "disabled";
 		};
 
-		usb_dev: usb@78d9000 {
+		otg: usb@78d9000 {
 			compatible = "qcom,ci-hdrc";
-			reg = <0x78d9000 0x400>;
-			dr_mode = "peripheral";
-			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
-			usb-phy = <&usb_otg>;
-			status = "disabled";
-		};
-
-		usb_host: ehci@78d9000 {
-			compatible = "qcom,ehci-host";
-			reg = <0x78d9000 0x400>;
-			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
-			usb-phy = <&usb_otg>;
-			status = "disabled";
-		};
-
-		usb_otg: phy@78d9000 {
-			compatible = "qcom,usb-otg-snps";
-			reg = <0x78d9000 0x400>;
+			reg = <0x78d9000 0x200>,
+			      <0x78d9200 0x200>;
 			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
-
-			qcom,vdd-levels = <500000 1000000 1320000>;
-			qcom,phy-init-sequence = <0x44 0x6B 0x24 0x13>;
-			dr_mode = "peripheral";
-			qcom,otg-control = <2>; // PMIC
-			qcom,manual-pullup;
-
 			clocks = <&gcc GCC_USB_HS_AHB_CLK>,
-				 <&gcc GCC_USB_HS_SYSTEM_CLK>,
-				 <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
-			clock-names = "iface", "core", "sleep";
-
-			resets = <&gcc GCC_USB2A_PHY_BCR>,
-				 <&gcc GCC_USB_HS_BCR>;
-			reset-names = "phy", "link";
+				 <&gcc GCC_USB_HS_SYSTEM_CLK>;
+			clock-names = "iface", "core";
+			assigned-clocks = <&gcc GCC_USB_HS_SYSTEM_CLK>;
+			assigned-clock-rates = <80000000>;
+			resets = <&gcc GCC_USB_HS_BCR>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			dr_mode = "otg";
+			ahb-burst-config = <0>;
+			phy-names = "usb-phy";
+			phys = <&usb_hs_phy>;
 			status = "disabled";
+			#reset-cells = <1>;
+
+			ulpi {
+				usb_hs_phy: phy {
+					compatible = "qcom,usb-hs-phy-msm8916",
+						     "qcom,usb-hs-phy";
+					#phy-cells = <0>;
+					clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
+					clock-names = "ref", "sleep";
+					resets = <&gcc GCC_USB2A_PHY_BCR>, <&otg 0>;
+					reset-names = "phy", "por";
+					qcom,init-seq = /bits/ 8 <0x0 0x44
+						0x1 0x6b 0x2 0x24 0x3 0x13>;
+				};
+			};
 		};
 
 		intc: interrupt-controller@b000000 {
-- 
2.10.0.297.gf6727b0

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web