| Message ID | 20230409200934.2329297-1-bhupesh.sharma@linaro.org |
|---|---|
| Headers | show |
| Series | Enable USB SS qmp phy for Qualcomm SM6115 SoC | expand |
On Sun, 9 Apr 2023 at 23:09, Bhupesh Sharma <bhupesh.sharma@linaro.org> wrote: > > 'qcom,msm8996-qmp-usb3-phy.yaml' defines bindings for several PHYs > which predate USB -> USB+DP migration. Since SM6115 and QCM2290 > nodes for USB QMP phy are being added to dtsi files by followup patches, > move these bindings instead to the newer style > 'qcom,sc8280xp-qmp-usb3-uni-phy.yaml' file. > > Since no device trees use these bindings presently, so we have no ABI breakages > with this patch. > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > .../phy/qcom,msm8996-qmp-usb3-phy.yaml | 27 ----------- > .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 45 ++++++++++++++++--- > 2 files changed, 40 insertions(+), 32 deletions(-) > > diff --git a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml > index e81a38281f8c..4c96dab5b9e3 100644 > --- a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml > @@ -23,14 +23,12 @@ properties: > - qcom,ipq8074-qmp-usb3-phy > - qcom,msm8996-qmp-usb3-phy > - qcom,msm8998-qmp-usb3-phy > - - qcom,qcm2290-qmp-usb3-phy > - qcom,sc7180-qmp-usb3-phy > - qcom,sc8180x-qmp-usb3-phy > - qcom,sdm845-qmp-usb3-phy > - qcom,sdm845-qmp-usb3-uni-phy > - qcom,sdx55-qmp-usb3-uni-phy > - qcom,sdx65-qmp-usb3-uni-phy > - - qcom,sm6115-qmp-usb3-phy > - qcom,sm8150-qmp-usb3-phy > - qcom,sm8150-qmp-usb3-uni-phy > - qcom,sm8250-qmp-usb3-phy > @@ -248,29 +246,6 @@ allOf: > - const: phy > - const: common > > - - if: > - properties: > - compatible: > - contains: > - enum: > - - qcom,qcm2290-qmp-usb3-phy > - - qcom,sm6115-qmp-usb3-phy > - then: > - properties: > - clocks: > - maxItems: 3 > - clock-names: > - items: > - - const: cfg_ahb > - - const: ref > - - const: com_aux > - resets: > - maxItems: 2 > - reset-names: > - items: > - - const: phy_phy > - - const: phy > - > - if: > properties: > compatible: > @@ -318,12 +293,10 @@ allOf: > enum: > - qcom,ipq6018-qmp-usb3-phy > - qcom,ipq8074-qmp-usb3-phy > - - qcom,qcm2290-qmp-usb3-phy > - qcom,sc7180-qmp-usb3-phy > - qcom,sc8180x-qmp-usb3-phy > - qcom,sdx55-qmp-usb3-uni-phy > - qcom,sdx65-qmp-usb3-uni-phy > - - qcom,sm6115-qmp-usb3-phy > - qcom,sm8150-qmp-usb3-uni-phy > - qcom,sm8250-qmp-usb3-phy > then: > diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml > index 16fce1038285..aa16d50c7c4e 100644 > --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml > @@ -16,20 +16,20 @@ description: > properties: > compatible: > enum: > + - qcom,qcm2290-qmp-usb3-phy > - qcom,sc8280xp-qmp-usb3-uni-phy > + - qcom,sm6115-qmp-usb3-phy > > reg: > maxItems: 1 > > clocks: > + minItems: 3 > maxItems: 4 > > clock-names: > - items: > - - const: aux > - - const: ref > - - const: com_aux > - - const: pipe > + minItems: 3 > + maxItems: 4 > > power-domains: > maxItems: 1 > @@ -71,6 +71,41 @@ required: > > additionalProperties: false > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,qcm2290-qmp-usb3-phy > + - qcom,sm6115-qmp-usb3-phy > + then: > + properties: > + clocks: > + maxItems: 3 > + clock-names: > + items: > + - const: cfg_ahb > + - const: ref > + - const: com_aux Doesn't it also need a pipe clock? It surely does: gcc_usb3_prim_phy_pipe_clk > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,sc8280xp-qmp-usb3-uni-phy > + then: > + properties: > + clocks: > + maxItems: 4 > + clock-names: > + items: > + - const: aux > + - const: ref > + - const: com_aux > + - const: pipe > + > examples: > - | > #include <dt-bindings/clock/qcom,gcc-sc8280xp.h> > -- > 2.38.1 >
Changes since v6: ----------------- - v6 can be seen here: https://lore.kernel.org/linux-arm-msm/20230407061122.2036838-1-bhupesh.sharma@linaro.org/ - Addressed review comments from Bjorn and Dmitry and dropped old bindings in this version. 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 | 45 ++++++++++++++++--- .../boot/dts/qcom/sm4250-oneplus-billie2.dts | 3 ++ arch/arm64/boot/dts/qcom/sm6115.dtsi | 27 ++++++++++- .../boot/dts/qcom/sm6115p-lenovo-j606f.dts | 3 ++ 5 files changed, 71 insertions(+), 34 deletions(-)