| Message ID | 20230324215550.1966809-5-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | phy: qcom-qmp-usb: split away legacy USB+DP code | expand |
On 24/03/2023 22:55, Dmitry Baryshkov wrote: > The qcom,msm8996-qmp-usb3-phy.yaml defines bindings for several PHYs > which predate USB -> USB+DP migration. Now as sm8150 has been migrated, > drop the legacy bindings completely. No device trees use them anymore. > Newer USB+DP bindings should use combo bindings from the beginning. Shouldn't we mark then as deprecated first ? Neil > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../phy/qcom,msm8996-qmp-usb3-phy.yaml | 80 ------------------- > 1 file changed, 80 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..5684eaf170e4 100644 > --- a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml > @@ -24,26 +24,17 @@ properties: > - 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 > - qcom,sm8250-qmp-usb3-uni-phy > - - qcom,sm8350-qmp-usb3-phy > - qcom,sm8350-qmp-usb3-uni-phy > - - qcom,sm8450-qmp-usb3-phy > > reg: > - minItems: 1 > items: > - description: serdes > - - description: DP_COM > > "#address-cells": > enum: [ 1, 2 ] > @@ -128,28 +119,6 @@ required: > additionalProperties: false > > allOf: > - - if: > - properties: > - compatible: > - contains: > - enum: > - - qcom,sc7180-qmp-usb3-phy > - then: > - properties: > - clocks: > - maxItems: 4 > - clock-names: > - items: > - - const: aux > - - const: cfg_ahb > - - const: ref > - - const: com_aux > - resets: > - maxItems: 1 > - reset-names: > - items: > - - const: phy > - > - if: > properties: > compatible: > @@ -204,7 +173,6 @@ allOf: > compatible: > contains: > enum: > - - qcom,sm8150-qmp-usb3-phy > - qcom,sm8150-qmp-usb3-uni-phy > - qcom,sm8250-qmp-usb3-uni-phy > - qcom,sm8350-qmp-usb3-uni-phy > @@ -225,29 +193,6 @@ allOf: > - const: phy > - const: common > > - - if: > - properties: > - compatible: > - contains: > - enum: > - - qcom,sm8250-qmp-usb3-phy > - - qcom,sm8350-qmp-usb3-phy > - then: > - properties: > - clocks: > - maxItems: 3 > - clock-names: > - items: > - - const: aux > - - const: ref_clk_src > - - const: com_aux > - resets: > - maxItems: 2 > - reset-names: > - items: > - - const: phy > - - const: common > - > - if: > properties: > compatible: > @@ -271,28 +216,6 @@ allOf: > - const: phy_phy > - const: phy > > - - if: > - properties: > - compatible: > - contains: > - enum: > - - qcom,sdm845-qmp-usb3-phy > - - qcom,sm8150-qmp-usb3-phy > - - qcom,sm8350-qmp-usb3-phy > - - qcom,sm8450-qmp-usb3-phy > - then: > - patternProperties: > - "^phy@[0-9a-f]+$": > - properties: > - reg: > - items: > - - description: TX lane 1 > - - description: RX lane 1 > - - description: PCS > - - description: TX lane 2 > - - description: RX lane 2 > - - description: PCS_MISC > - > - if: > properties: > compatible: > @@ -319,13 +242,10 @@ allOf: > - 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: > patternProperties: > "^phy@[0-9a-f]+$":
On 27/03/2023 11:00, Neil Armstrong wrote: > On 24/03/2023 22:55, Dmitry Baryshkov wrote: >> The qcom,msm8996-qmp-usb3-phy.yaml defines bindings for several PHYs >> which predate USB -> USB+DP migration. Now as sm8150 has been migrated, >> drop the legacy bindings completely. No device trees use them anymore. >> Newer USB+DP bindings should use combo bindings from the beginning. > > Shouldn't we mark then as deprecated first ? Not sure. What would be the reason to do that? There are no users for them anymore. They do not describe properties (which can be deprecated), instead they describe devices which are no longer present in DT. > > Neil > >> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- >> .../phy/qcom,msm8996-qmp-usb3-phy.yaml | 80 ------------------- >> 1 file changed, 80 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..5684eaf170e4 100644 >> --- >> a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml >> +++ >> b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml >> @@ -24,26 +24,17 @@ properties: >> - 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 >> - qcom,sm8250-qmp-usb3-uni-phy >> - - qcom,sm8350-qmp-usb3-phy >> - qcom,sm8350-qmp-usb3-uni-phy >> - - qcom,sm8450-qmp-usb3-phy >> reg: >> - minItems: 1 >> items: >> - description: serdes >> - - description: DP_COM >> "#address-cells": >> enum: [ 1, 2 ] >> @@ -128,28 +119,6 @@ required: >> additionalProperties: false >> allOf: >> - - if: >> - properties: >> - compatible: >> - contains: >> - enum: >> - - qcom,sc7180-qmp-usb3-phy >> - then: >> - properties: >> - clocks: >> - maxItems: 4 >> - clock-names: >> - items: >> - - const: aux >> - - const: cfg_ahb >> - - const: ref >> - - const: com_aux >> - resets: >> - maxItems: 1 >> - reset-names: >> - items: >> - - const: phy >> - >> - if: >> properties: >> compatible: >> @@ -204,7 +173,6 @@ allOf: >> compatible: >> contains: >> enum: >> - - qcom,sm8150-qmp-usb3-phy >> - qcom,sm8150-qmp-usb3-uni-phy >> - qcom,sm8250-qmp-usb3-uni-phy >> - qcom,sm8350-qmp-usb3-uni-phy >> @@ -225,29 +193,6 @@ allOf: >> - const: phy >> - const: common >> - - if: >> - properties: >> - compatible: >> - contains: >> - enum: >> - - qcom,sm8250-qmp-usb3-phy >> - - qcom,sm8350-qmp-usb3-phy >> - then: >> - properties: >> - clocks: >> - maxItems: 3 >> - clock-names: >> - items: >> - - const: aux >> - - const: ref_clk_src >> - - const: com_aux >> - resets: >> - maxItems: 2 >> - reset-names: >> - items: >> - - const: phy >> - - const: common >> - >> - if: >> properties: >> compatible: >> @@ -271,28 +216,6 @@ allOf: >> - const: phy_phy >> - const: phy >> - - if: >> - properties: >> - compatible: >> - contains: >> - enum: >> - - qcom,sdm845-qmp-usb3-phy >> - - qcom,sm8150-qmp-usb3-phy >> - - qcom,sm8350-qmp-usb3-phy >> - - qcom,sm8450-qmp-usb3-phy >> - then: >> - patternProperties: >> - "^phy@[0-9a-f]+$": >> - properties: >> - reg: >> - items: >> - - description: TX lane 1 >> - - description: RX lane 1 >> - - description: PCS >> - - description: TX lane 2 >> - - description: RX lane 2 >> - - description: PCS_MISC >> - >> - if: >> properties: >> compatible: >> @@ -319,13 +242,10 @@ allOf: >> - 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: >> patternProperties: >> "^phy@[0-9a-f]+$": >
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..5684eaf170e4 100644 --- a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml @@ -24,26 +24,17 @@ properties: - 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 - qcom,sm8250-qmp-usb3-uni-phy - - qcom,sm8350-qmp-usb3-phy - qcom,sm8350-qmp-usb3-uni-phy - - qcom,sm8450-qmp-usb3-phy reg: - minItems: 1 items: - description: serdes - - description: DP_COM "#address-cells": enum: [ 1, 2 ] @@ -128,28 +119,6 @@ required: additionalProperties: false allOf: - - if: - properties: - compatible: - contains: - enum: - - qcom,sc7180-qmp-usb3-phy - then: - properties: - clocks: - maxItems: 4 - clock-names: - items: - - const: aux - - const: cfg_ahb - - const: ref - - const: com_aux - resets: - maxItems: 1 - reset-names: - items: - - const: phy - - if: properties: compatible: @@ -204,7 +173,6 @@ allOf: compatible: contains: enum: - - qcom,sm8150-qmp-usb3-phy - qcom,sm8150-qmp-usb3-uni-phy - qcom,sm8250-qmp-usb3-uni-phy - qcom,sm8350-qmp-usb3-uni-phy @@ -225,29 +193,6 @@ allOf: - const: phy - const: common - - if: - properties: - compatible: - contains: - enum: - - qcom,sm8250-qmp-usb3-phy - - qcom,sm8350-qmp-usb3-phy - then: - properties: - clocks: - maxItems: 3 - clock-names: - items: - - const: aux - - const: ref_clk_src - - const: com_aux - resets: - maxItems: 2 - reset-names: - items: - - const: phy - - const: common - - if: properties: compatible: @@ -271,28 +216,6 @@ allOf: - const: phy_phy - const: phy - - if: - properties: - compatible: - contains: - enum: - - qcom,sdm845-qmp-usb3-phy - - qcom,sm8150-qmp-usb3-phy - - qcom,sm8350-qmp-usb3-phy - - qcom,sm8450-qmp-usb3-phy - then: - patternProperties: - "^phy@[0-9a-f]+$": - properties: - reg: - items: - - description: TX lane 1 - - description: RX lane 1 - - description: PCS - - description: TX lane 2 - - description: RX lane 2 - - description: PCS_MISC - - if: properties: compatible: @@ -319,13 +242,10 @@ allOf: - 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: patternProperties: "^phy@[0-9a-f]+$":
The qcom,msm8996-qmp-usb3-phy.yaml defines bindings for several PHYs which predate USB -> USB+DP migration. Now as sm8150 has been migrated, drop the legacy bindings completely. No device trees use them anymore. Newer USB+DP bindings should use combo bindings from the beginning. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- .../phy/qcom,msm8996-qmp-usb3-phy.yaml | 80 ------------------- 1 file changed, 80 deletions(-)