Skip to contentSkip to conversation

ARM: dts: qcom: msm8960: add references to USB1

PATCH In review Shinjo Park 4 participants 7 messages Jul 28, 2022 – Aug 9, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/3 ARM: dts: qcom: msm8960: add references to USB1

Use the same USB definition as qcom-apq8064.dtsi, tested on Casio GzOne.

---
 arch/arm/boot/dts/qcom-msm8960.dtsi | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +32 -0
index 991eb1948..a32073d61 100644
@@ -4,6 +4,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/clock/qcom,lcc-msm8960.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/mfd/qcom-rpm.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
@@ -201,6 +202,37 @@ regulators {
 			};
 		};
 
+		usb1: usb@12500000 {
+			compatible = "qcom,ci-hdrc";
+			reg = <0x12500000 0x200>,
+			      <0x12500200 0x200>;
+			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc USB_HS1_XCVR_CLK>, <&gcc USB_HS1_H_CLK>;
+			clock-names = "core", "iface";
+			assigned-clocks = <&gcc USB_HS1_XCVR_CLK>;
+			assigned-clock-rates = <60000000>;
+			resets = <&gcc USB_HS1_RESET>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			ahb-burst-config = <0>;
+			phys = <&usb_hs1_phy>;
+			phy-names = "usb-phy";
+			status = "disabled";
+			#reset-cells = <1>;
+
+			ulpi {
+				usb_hs1_phy: phy {
+					compatible = "qcom,usb-hs-phy-msm8960",
+						     "qcom,usb-hs-phy";
+					clocks = <&sleep_clk>, <&cxo_board>;
+					clock-names = "sleep", "ref";
+					resets = <&usb1 0>;
+					reset-names = "por";
+					#phy-cells = <0>;
+				};
+			};
+		};
+
 		acc0: clock-controller@2088000 {
 			compatible = "qcom,kpss-acc-v1";
 			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
Signature · 1 line
2.34.1
#1 lore raw
Quoted 4 lines · Shinjo Park

Use the same USB definition as qcom-apq8064.dtsi, tested on Casio GzOne.

Thank you for your patch. There is something to discuss/improve.

Similar problems as with previous patch - thread your patches and how did you get review?

Quoted 26 lines
---
 arch/arm/boot/dts/qcom-msm8960.dtsi | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +7 -0
index 991eb1948..a32073d61 100644
@@ -4,6 +4,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/clock/qcom,lcc-msm8960.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/mfd/qcom-rpm.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
@@ -201,6 +202,37 @@ regulators {
 			};
 		};
 
+		usb1: usb@12500000 {
+			compatible = "qcom,ci-hdrc";
+			reg = <0x12500000 0x200>,
+			      <0x12500200 0x200>;
+			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc USB_HS1_XCVR_CLK>, <&gcc USB_HS1_H_CLK>;

arch/arm/boot/dts/qcom-msm8960.dtsi regulators { · line 220

Quoted 10 lines
arch/arm/boot/dts/qcom-msm8960.dtsi +10 -0
+			clock-names = "core", "iface";
+			assigned-clocks = <&gcc USB_HS1_XCVR_CLK>;
+			assigned-clock-rates = <60000000>;
+			resets = <&gcc USB_HS1_RESET>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			ahb-burst-config = <0>;
+			phys = <&usb_hs1_phy>;
+			phy-names = "usb-phy";
+			status = "disabled";

status is the last property.

arch/arm/boot/dts/qcom-msm8960.dtsi regulators { · line 221

Quoted 1 line
arch/arm/boot/dts/qcom-msm8960.dtsi +1 -0
+			#reset-cells = <1>;

Best regards,
Krzysztof

#2 lore raw

PATCH v2 2/3 ARM: dts: qcom: msm8960: add the device node of USB1

Use the same USB definition as qcom-apq8064.dtsi, tested on Casio GzOne.

---

v2:
- Rewrite commit message
- Reorder status line

 arch/arm/boot/dts/qcom-msm8960.dtsi | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +32 -0
index e1f010c9643e..4c8a67c0cc7b 100644
@@ -4,6 +4,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/clock/qcom,lcc-msm8960.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/mfd/qcom-rpm.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
@@ -201,6 +202,37 @@ regulators {
 			};
 		};
 
+		usb1: usb@12500000 {
+			compatible = "qcom,ci-hdrc";
+			reg = <0x12500000 0x200>,
+			      <0x12500200 0x200>;
+			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc USB_HS1_XCVR_CLK>, <&gcc USB_HS1_H_CLK>;
+			clock-names = "core", "iface";
+			assigned-clocks = <&gcc USB_HS1_XCVR_CLK>;
+			assigned-clock-rates = <60000000>;
+			resets = <&gcc USB_HS1_RESET>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			ahb-burst-config = <0>;
+			phys = <&usb_hs1_phy>;
+			phy-names = "usb-phy";
+			#reset-cells = <1>;
+			status = "disabled";
+
+			ulpi {
+				usb_hs1_phy: phy {
+					compatible = "qcom,usb-hs-phy-msm8960",
+						     "qcom,usb-hs-phy";
+					clocks = <&sleep_clk>, <&cxo_board>;
+					clock-names = "sleep", "ref";
+					resets = <&usb1 0>;
+					reset-names = "por";
+					#phy-cells = <0>;
+				};
+			};
+		};
+
 		acc0: clock-controller@2088000 {
 			compatible = "qcom,kpss-acc-v1";
 			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
Signature · 1 line
2.34.1
#3 lore raw

Re: [PATCH v2 2/3] ARM: dts: qcom: msm8960: add the device node of USB1

Quoted 1 line

#include <dt-bindings/clock/qcom,lcc-msm8960.h>

Does not apply cleanly to mainline. Please include the above

#4 lore raw

Re: [PATCH v2 2/3] ARM: dts: qcom: msm8960: add the device node of USB1

Quoted 3 lines · On 2022년 8월 2일 화요일 오전 7시 21분 54초 CEST Rudraksha Gupta wrote:
Quoted 1 line

#include <dt-bindings/clock/qcom,lcc-msm8960.h>

Does not apply cleanly to mainline. Please include the above

Will be fixed in the next revision of this patch.

#5 lore raw

PATCH v3 2/3 ARM: dts: qcom: msm8960: add the device node of USB1

Use the same USB definition as qcom-apq8064.dtsi, tested on Casio GzOne.

---

v3:
- Include missing clock/qcom,lcc-msm8960.h to make cleanly applicable

v2:
- Rewrite commit message
- Reorder status line

 arch/arm/boot/dts/qcom-msm8960.dtsi | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +33 -0
index e14e1c5d1..0e099aa7c 100644
@@ -3,6 +3,8 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
+#include <dt-bindings/clock/qcom,lcc-msm8960.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/mfd/qcom-rpm.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
@@ -167,6 +169,37 @@ regulators {
 			};
 		};
 
+		usb1: usb@12500000 {
+			compatible = "qcom,ci-hdrc";
+			reg = <0x12500000 0x200>,
+			      <0x12500200 0x200>;
+			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc USB_HS1_XCVR_CLK>, <&gcc USB_HS1_H_CLK>;
+			clock-names = "core", "iface";
+			assigned-clocks = <&gcc USB_HS1_XCVR_CLK>;
+			assigned-clock-rates = <60000000>;
+			resets = <&gcc USB_HS1_RESET>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			ahb-burst-config = <0>;
+			phys = <&usb_hs1_phy>;
+			phy-names = "usb-phy";
+			#reset-cells = <1>;
+			status = "disabled";
+
+			ulpi {
+				usb_hs1_phy: phy {
+					compatible = "qcom,usb-hs-phy-msm8960",
+						     "qcom,usb-hs-phy";
+					clocks = <&sleep_clk>, <&cxo_board>;
+					clock-names = "sleep", "ref";
+					resets = <&usb1 0>;
+					reset-names = "por";
+					#phy-cells = <0>;
+				};
+			};
+		};
+
 		acc0: clock-controller@2088000 {
 			compatible = "qcom,kpss-acc-v1";
 			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
Signature · 1 line
2.34.1
#6 lore raw

Re: [PATCH v3 2/3] ARM: dts: qcom: msm8960: add the device node of USB1

Quoted 2 lines · Shinjo Park

Use the same USB definition as qcom-apq8064.dtsi, tested on Casio GzOne.

I think this looks good, but I have a v2 of patch 1 and a v3 of patch 2, and I don't seem to have patch 3 in my inbox(?)

Can you please resubmit the 3 patches with a --cover-letter, instead of each patch being a reply of the previous instance of that particular patch? This will make it much easier for me to merge the end result.

Thanks,
Bjorn

Quoted 68 lines

---

v3:
- Include missing clock/qcom,lcc-msm8960.h to make cleanly applicable

v2:
- Rewrite commit message
- Reorder status line

 arch/arm/boot/dts/qcom-msm8960.dtsi | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +33 -0
index e14e1c5d1..0e099aa7c 100644
@@ -3,6 +3,8 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
+#include <dt-bindings/clock/qcom,lcc-msm8960.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/mfd/qcom-rpm.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
@@ -167,6 +169,37 @@ regulators {
 			};
 		};
 
+		usb1: usb@12500000 {
+			compatible = "qcom,ci-hdrc";
+			reg = <0x12500000 0x200>,
+			      <0x12500200 0x200>;
+			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc USB_HS1_XCVR_CLK>, <&gcc USB_HS1_H_CLK>;
+			clock-names = "core", "iface";
+			assigned-clocks = <&gcc USB_HS1_XCVR_CLK>;
+			assigned-clock-rates = <60000000>;
+			resets = <&gcc USB_HS1_RESET>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			ahb-burst-config = <0>;
+			phys = <&usb_hs1_phy>;
+			phy-names = "usb-phy";
+			#reset-cells = <1>;
+			status = "disabled";
+
+			ulpi {
+				usb_hs1_phy: phy {
+					compatible = "qcom,usb-hs-phy-msm8960",
+						     "qcom,usb-hs-phy";
+					clocks = <&sleep_clk>, <&cxo_board>;
+					clock-names = "sleep", "ref";
+					resets = <&usb1 0>;
+					reset-names = "por";
+					#phy-cells = <0>;
+				};
+			};
+		};
+
 		acc0: clock-controller@2088000 {
 			compatible = "qcom,kpss-acc-v1";
 			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
Signature · 1 line
2.34.1