On Sun, 9 Apr 2023 at 23:09, Bhupesh Sharma <bhupesh.sharma@xxxxxxxxxx> 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@xxxxxxxxxx> > --- > .../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 > -- With best wishes Dmitry
