Add USB related nodes for SC7180
Subsystems (4)
v3 cover Add USB related nodes for SC7180
Add nodes for DWC3 USB controller, QMP and QUSB PHYs and enable them in idp device.
This patch has dependency on below series
https://lkml.org/lkml/2019/11/8/149
changes in v3:
*Added a space after cfg_ahb", as per Stephen's comment
changes in v2:
* Addressed Stephen's comments on sorting the include file and alignment issues.
Sandeep Maheswaram (1):
arm64: dts: qcom: sc7180: Add USB related nodes
arch/arm64/boot/dts/qcom/sc7180-idp.dts | 25 ++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 1/1 arm64: dts: qcom: sc7180: Add USB related nodes
Add nodes for DWC3 USB controller, QMP and QUSB PHYs.
--- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 25 ++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)
arch/arm64/boot/dts/qcom/sc7180-idp.dts +25 -0
@@ -400,3 +400,28 @@ bias-pull-up; }; }; + +&usb_1 { + status = "okay"; +}; + +&usb_1_dwc3 { + dr_mode = "host"; +}; + +&usb_1_hsphy { + status = "okay"; + vdd-supply = <&vreg_l4a_0p8>; + vdda-pll-supply = <&vreg_l11a_1p8>; + vdda-phy-dpdm-supply = <&vreg_l17a_3p0>; + qcom,imp-res-offset-value = <8>; + qcom,hstx-trim-value = <QUSB2_V2_HSTX_TRIM_21_6_MA>; + qcom,preemphasis-level = <QUSB2_V2_PREEMPHASIS_5_PERCENT>; + qcom,preemphasis-width = <QUSB2_V2_PREEMPHASIS_WIDTH_HALF_BIT>; +}; + +&usb_1_qmpphy { + status = "okay"; + vdda-phy-supply = <&vreg_l3c_1p2>; + vdda-pll-supply = <&vreg_l4a_0p8>; +};
arch/arm64/boot/dts/qcom/sc7180.dtsi +105 -0
123 lines not on this page · raw message
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 1/1] arm64: dts: qcom: sc7180: Add USB related nodes
Hi Sandeep,
Quoted 48 lines · Sandeep Maheswaram
Add nodes for DWC3 USB controller, QMP and QUSB PHYs.
Signed-off-by Sandeep Maheswaram <[email protected]>Reviewed-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 25 ++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +32
-0+ usb_1: usb@a6f8800 { + compatible = "qcom,sc7180-dwc3", "qcom,dwc3"; + reg = <0 0x0a6f8800 0 0x400>; + status = "disabled"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + dma-ranges; + + clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>, + <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_SLEEP_CLK>; + clock-names = "cfg_noc", "core", "iface", "mock_utmi", + "sleep"; + + assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>; + assigned-clock-rates = <19200000>, <150000000>; + + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq", "ss_phy_irq", + "dm_hs_phy_irq", "dp_hs_phy_irq"; + + power-domains = <&gcc USB30_PRIM_GDSC>; + + resets = <&gcc GCC_USB30_PRIM_BCR>; +
arch/arm64/boot/dts/qcom/sc7180.dtsi line 1016
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +10
-0+ usb_1_dwc3: dwc3@a600000 { + compatible = "snps,dwc3"; + reg = <0 0x0a600000 0 0xe000>; + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; + iommus = <&apps_smmu 0x540 0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phy-names = "usb2-phy", "usb3-phy"; + };
I see the following message at boot:
[ 4.248436] dwc3 a600000.dwc3: Failed to get clk 'ref': -2
Apparently the driver is operational regardless, however the binding lists the clocks as required:
Required properties:
...
- clock-names: should contain "ref", "bus_early", "suspend"
- clocks: list of phandle and clock specifier pairs corresponding to entries in the clock-names property.
[Documentation/devicetree/bindings/usb/dwc3.txt]
The driver code also has a comment stating that the clocks should be specified:
/*
* Clocks are optional, but new DT platforms should support all
* clocks as required by the DT-binding.
*/
[drivers/usb/dwc3/core.txt]
Re: [PATCH v3 1/1] arm64: dts: qcom: sc7180: Add USB related nodes
Hi Matthias,
Thanks for the review.
Quoted 79 lines · Matthias Kaehlcke
Hi Sandeep,
Quoted 48 lines · Sandeep Maheswaram
Add nodes for DWC3 USB controller, QMP and QUSB PHYs.
Signed-off-by Sandeep Maheswaram <[email protected]>Reviewed-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 25 ++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +32
-0+ usb_1: usb@a6f8800 { + compatible = "qcom,sc7180-dwc3", "qcom,dwc3"; + reg = <0 0x0a6f8800 0 0x400>; + status = "disabled"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + dma-ranges; + + clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>, + <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_SLEEP_CLK>; + clock-names = "cfg_noc", "core", "iface", "mock_utmi", + "sleep"; + + assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>; + assigned-clock-rates = <19200000>, <150000000>; + + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq", "ss_phy_irq", + "dm_hs_phy_irq", "dp_hs_phy_irq"; + + power-domains = <&gcc USB30_PRIM_GDSC>; + + resets = <&gcc GCC_USB30_PRIM_BCR>; +arch/arm64/boot/dts/qcom/sc7180.dtsi line 1016
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +10
-0+ usb_1_dwc3: dwc3@a600000 { + compatible = "snps,dwc3"; + reg = <0 0x0a600000 0 0xe000>; + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; + iommus = <&apps_smmu 0x540 0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phy-names = "usb2-phy", "usb3-phy"; + };I see the following message at boot:
[ 4.248436] dwc3 a600000.dwc3: Failed to get clk 'ref': -2Apparently the driver is operational regardless, however the binding lists the clocks as required:
Required properties:
...
- clock-names: should contain "ref", "bus_early", "suspend"
- clocks: list of phandle and clock specifier pairs corresponding to entries in the clock-names property.[
Documentation/devicetree/bindings/usb/dwc3.txt]The driver code also has a comment stating that the clocks should be specified:
Quoted 6 lines
/*
* Clocks are optional, but new DT platforms should support all
* clocks as required by the DT-binding.
*/
[drivers/usb/dwc3/core.txt]We are implenting all the required clocks in glue driver drivers/usb/dwc3/dwc3-qcom.c.
Also there is exception for qcom,dwc3 in documentation
Documentation/devicetree/bindings/usb/dwc3.txt
Exception for clocks:
clocks are optional if the parent node (i.e. glue-layer) is compatible to one of the following:
"amlogic,meson-axg-dwc3"
"amlogic,meson-gxl-dwc3"
"cavium,octeon-7130-usb-uctl"
"qcom,dwc3"
"samsung,exynos5250-dwusb3"
"samsung,exynos5433-dwusb3"
"samsung,exynos7-dwusb3"
"sprd,sc9860-dwc3"
"st,stih407-dwc3"
"ti,am437x-dwc3"
"ti,dwc3"
"ti,keystone-dwc3"
"rockchip,rk3399-dwc3"
"xlnx,zynqmp-dwc3"
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 1/1] arm64: dts: qcom: sc7180: Add USB related nodes
In reply to a message not in the archiveQuoted 100 lines · Sandeep Maheswaram (Temp)
Hi Matthias,
Thanks for the review.
Quoted 79 lines · Matthias Kaehlcke
Hi Sandeep,
Quoted 48 lines · Sandeep Maheswaram
Add nodes for DWC3 USB controller, QMP and QUSB PHYs.
Signed-off-by Sandeep Maheswaram <[email protected]>Reviewed-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 25 ++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +32
-0+ usb_1: usb@a6f8800 { + compatible = "qcom,sc7180-dwc3", "qcom,dwc3"; + reg = <0 0x0a6f8800 0 0x400>; + status = "disabled"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + dma-ranges; + + clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>, + <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_SLEEP_CLK>; + clock-names = "cfg_noc", "core", "iface", "mock_utmi", + "sleep"; + + assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>; + assigned-clock-rates = <19200000>, <150000000>; + + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq", "ss_phy_irq", + "dm_hs_phy_irq", "dp_hs_phy_irq"; + + power-domains = <&gcc USB30_PRIM_GDSC>; + + resets = <&gcc GCC_USB30_PRIM_BCR>; +arch/arm64/boot/dts/qcom/sc7180.dtsi line 1016
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +10
-0+ usb_1_dwc3: dwc3@a600000 { + compatible = "snps,dwc3"; + reg = <0 0x0a600000 0 0xe000>; + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; + iommus = <&apps_smmu 0x540 0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phy-names = "usb2-phy", "usb3-phy"; + };I see the following message at boot:
[ 4.248436] dwc3 a600000.dwc3: Failed to get clk 'ref': -2Apparently the driver is operational regardless, however the binding lists the clocks as required:
Required properties:
...
- clock-names: should contain "ref", "bus_early", "suspend"
- clocks: list of phandle and clock specifier pairs corresponding to entries in the clock-names property.[
Documentation/devicetree/bindings/usb/dwc3.txt]The driver code also has a comment stating that the clocks should be specified:
Quoted 6 lines
/* * Clocks are optional, but new DT platforms should support all * clocks as required by the DT-binding. */ [drivers/usb/dwc3/core.txt]We are implenting all the required clocks in glue driver
drivers/usb/dwc3/dwc3-qcom.c.Also there is exception for qcom,dwc3 in documentation
Documentation/devicetree/bindings/usb/dwc3.txtException for clocks:
Quoted 16 lines
clocks are optional if the parent node (i.e. glue-layer) is compatible to one of the following:
"amlogic,meson-axg-dwc3"
"amlogic,meson-gxl-dwc3"
"cavium,octeon-7130-usb-uctl"
"qcom,dwc3"
"samsung,exynos5250-dwusb3"
"samsung,exynos5433-dwusb3"
"samsung,exynos7-dwusb3"
"sprd,sc9860-dwc3"
"st,stih407-dwc3"
"ti,am437x-dwc3"
"ti,dwc3"
"ti,keystone-dwc3"
"rockchip,rk3399-dwc3"
"xlnx,zynqmp-dwc3"
ah, I missed this, thanks for the pointer!
Re: [PATCH v3 1/1] arm64: dts: qcom: sc7180: Add USB related nodes
In reply to Matthias KaehlckeQuoted 64 lines · Matthias Kaehlcke
Hi Sandeep,
Quoted 48 lines · Sandeep Maheswaram
Add nodes for DWC3 USB controller, QMP and QUSB PHYs.
Signed-off-by Sandeep Maheswaram <[email protected]>Reviewed-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 25 ++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +32
-0+ usb_1: usb@a6f8800 { + compatible = "qcom,sc7180-dwc3", "qcom,dwc3"; + reg = <0 0x0a6f8800 0 0x400>; + status = "disabled"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + dma-ranges; + + clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>, + <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_SLEEP_CLK>; + clock-names = "cfg_noc", "core", "iface", "mock_utmi", + "sleep"; + + assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>; + assigned-clock-rates = <19200000>, <150000000>; + + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq", "ss_phy_irq", + "dm_hs_phy_irq", "dp_hs_phy_irq"; + + power-domains = <&gcc USB30_PRIM_GDSC>; + + resets = <&gcc GCC_USB30_PRIM_BCR>; +arch/arm64/boot/dts/qcom/sc7180.dtsi line 1016
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +10
-0+ usb_1_dwc3: dwc3@a600000 { + compatible = "snps,dwc3"; + reg = <0 0x0a600000 0 0xe000>; + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; + iommus = <&apps_smmu 0x540 0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phy-names = "usb2-phy", "usb3-phy"; + };I see the following message at boot:
Quoted 2 lines
[ 4.248436] dwc3 a600000.dwc3: Failed to get clk 'ref': -2
dwc3-qcom picks up the clocks per the names of the binding, but then dwc3 tries to pick up the same clocks based on the generic names.
At some point it would be nice to figure out how to have these two play nice with each other, but for now it's a "harmless" error print - which has consumed many hours of unnecessary debugging by various people...
Regards,
Bjorn