| Message ID | 20230407061122.2036838-1-bhupesh.sharma@linaro.org |
|---|---|
| Headers | show |
| Series | Enable USB SS qmp phy for Qualcomm SM6115 SoC | expand |
On Fri, Apr 07, 2023 at 11:41:22AM +0530, Bhupesh Sharma wrote: > Add USB superspeed qmp phy node to dtsi. > > Make sure that the various board dts files (which include sm4250.dtsi file) > continue to work as intended. > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > .../boot/dts/qcom/sm4250-oneplus-billie2.dts | 3 ++ > arch/arm64/boot/dts/qcom/sm6115.dtsi | 36 +++++++++++++++++-- > .../boot/dts/qcom/sm6115p-lenovo-j606f.dts | 3 ++ > 3 files changed, 40 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts > index a1f0622db5a0..75951fd439df 100644 > --- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts > +++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts > @@ -242,6 +242,9 @@ &usb { > &usb_dwc3 { > maximum-speed = "high-speed"; > dr_mode = "peripheral"; > + > + phys = <&usb_hsphy>; > + phy-names = "usb2-phy"; > }; > > &usb_hsphy { > diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi > index 2505c815c65a..f42065a0a71d 100644 > --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi > @@ -651,6 +651,38 @@ usb_hsphy: phy@1613000 { > status = "disabled"; > }; > > + usb_qmpphy: phy@1615000 { > + compatible = "qcom,sm6115-qmp-usb3-phy"; > + reg = <0x0 0x01615000 0x0 0x200>; > + clocks = <&gcc GCC_AHB2PHY_USB_CLK>, > + <&gcc GCC_USB3_PRIM_CLKREF_CLK>, > + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; > + clock-names = "cfg_ahb", > + "ref", > + "com_aux"; > + resets = <&gcc GCC_USB3_PHY_PRIM_SP0_BCR>, > + <&gcc GCC_USB3PHY_PHY_PRIM_SP0_BCR>; > + reset-names = "phy", "phy_phy"; > + status = "disabled"; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + usb_ssphy: phy@1615200 { Please don't introduce the old-style QMP binding in new platforms. Thanks, Bjorn > + reg = <0x0 0x01615200 0x0 0x200>, > + <0x0 0x01615400 0x0 0x200>, > + <0x0 0x01615c00 0x0 0x400>, > + <0x0 0x01615600 0x0 0x200>, > + <0x0 0x01615800 0x0 0x200>, > + <0x0 0x01615a00 0x0 0x100>; > + #clock-cells = <0>; > + #phy-cells = <0>; > + clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; > + clock-names = "pipe0"; > + clock-output-names = "usb3_phy_pipe_clk_src"; > + }; > + }; > + > qfprom@1b40000 { > compatible = "qcom,sm6115-qfprom", "qcom,qfprom"; > reg = <0x0 0x01b40000 0x0 0x7000>; > @@ -1101,8 +1133,8 @@ usb_dwc3: usb@4e00000 { > compatible = "snps,dwc3"; > reg = <0x0 0x04e00000 0x0 0xcd00>; > interrupts = <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>; > - phys = <&usb_hsphy>; > - phy-names = "usb2-phy"; > + phys = <&usb_hsphy>, <&usb_ssphy>; > + phy-names = "usb2-phy", "usb3-phy"; > iommus = <&apps_smmu 0x120 0x0>; > snps,dis_u2_susphy_quirk; > snps,dis_enblslpm_quirk; > diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts > index 10c9d338446c..d60cc024749b 100644 > --- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts > +++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts > @@ -280,6 +280,9 @@ &usb { > &usb_dwc3 { > maximum-speed = "high-speed"; > dr_mode = "peripheral"; > + > + phys = <&usb_hsphy>; > + phy-names = "usb2-phy"; > }; > > &usb_hsphy { > -- > 2.38.1 >
Changes since v5: ----------------- - v5 can be seen here: https://lore.kernel.org/linux-arm-msm/20230405191633.1864671-1-bhupesh.sharma@linaro.org/ - Addressed review comments from Dmitry and made [PATCH 1/2] compatible with his 'split away legacy USB+DP code' series: <https://patchwork.kernel.org/project/linux-phy/cover/20230324215550.1966809-1-dmitry.baryshkov@linaro.org> Changes since v4: ----------------- - v4 can be seen here: https://lore.kernel.org/linux-arm-msm/20230401154725.1059563-1-bhupesh.sharma@linaro.org/ - Collected Krzysztof's Ack for [PATCH 1/2]. - Added more descriptive commit logs as per Dmitry's comments on v4. Changes since v3: ----------------- - v3 can be seen here: https://lore.kernel.org/linux-arm-msm/20221215094532.589291-4-bhupesh.sharma@linaro.org/ - Fixed v4 as per the downstream driver code: https://android.googlesource.com/kernel/msm-extra/devicetree/+/refs/heads/android-msm-bramble-4.19-android11-qpr1/qcom/bengal-usb.dtsi#296 This patchset adds the support for USB SS qmp phy for Qualcomm SM6115 SoC. For the previous versions of this patch there were conversations on irc as to whether this was a 'qcom,usb-ssphy-qmp-usb3-or-dp' or a 'qcom,usb-ssphy-qmp-dp-combo' as per downstream code and hardware documentation. But after a careful look at downstream dtsi (see [1]) it appears that this indeed is a 'qcom,usb-ssphy-qmp-usb3-or-dp' phy and not a 'dp-combo' phy. [1]. https://android.googlesource.com/kernel/msm-extra/devicetree/+/refs/heads/android-msm-bramble-4.19-android11-qpr1/qcom/bengal-usb.dtsi#296 Bhupesh Sharma (2): dt-bindings: phy: qcom,qmp-usb: Drop legacy bindings and move to newer one (SM6115 & QCM2290) arm64: dts: qcom: sm6115: Add USB SS qmp phy node .../phy/qcom,msm8996-qmp-usb3-phy.yaml | 27 ----- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 109 +++++++++++++++++- .../boot/dts/qcom/sm4250-oneplus-billie2.dts | 3 + arch/arm64/boot/dts/qcom/sm6115.dtsi | 36 +++++- .../boot/dts/qcom/sm6115p-lenovo-j606f.dts | 3 + 5 files changed, 144 insertions(+), 34 deletions(-)