| Message ID | 20230502053534.1240553-2-bhupesh.sharma@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Enable USB SS qmp phy for Qualcomm SM6115 SoC | expand |
On 02/05/2023 07:35, Bhupesh Sharma 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. > > clock-names: > - items: > - - const: aux > - - const: ref > - - const: com_aux > - - const: pipe > + maxItems: 4 > > power-domains: > maxItems: 1 > @@ -71,6 +69,42 @@ required: > > additionalProperties: false > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,qcm2290-qmp-usb3-phy > + - qcom,sm6115-qmp-usb3-phy > + then: > + properties: > + clocks: > + maxItems: 4 > + clock-names: > + items: > + - const: cfg_ahb > + - const: ref > + - const: com_aux > + - const: pipe I am pretty sure I acked it and there were no changes here... but since you did not include it, then lets keep the clock order the same as sc8280xp. ABI is anyway affected, right? Best regards, Krzysztof
On Wed, 3 May 2023 at 21:55, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 02/05/2023 07:35, Bhupesh Sharma 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. > > > > > > clock-names: > > - items: > > - - const: aux > > - - const: ref > > - - const: com_aux > > - - const: pipe > > + maxItems: 4 > > > > power-domains: > > maxItems: 1 > > @@ -71,6 +69,42 @@ required: > > > > additionalProperties: false > > > > +allOf: > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - qcom,qcm2290-qmp-usb3-phy > > + - qcom,sm6115-qmp-usb3-phy > > + then: > > + properties: > > + clocks: > > + maxItems: 4 > > + clock-names: > > + items: > > + - const: cfg_ahb > > + - const: ref > > + - const: com_aux > > + - const: pipe > > I am pretty sure I acked it and there were no changes here... but since > you did not include it, then lets keep the clock order the same as > sc8280xp. ABI is anyway affected, right? Yes, I forgot to include your Ack in this version :( Ok, I will fix the clock order in v11. Thanks, Bhupesh
Hi Krzysztof, On 5/4/23 10:42 PM, Bhupesh Sharma wrote: > On Wed, 3 May 2023 at 21:55, Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> >> On 02/05/2023 07:35, Bhupesh Sharma 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. >>> >> >> >>> clock-names: >>> - items: >>> - - const: aux >>> - - const: ref >>> - - const: com_aux >>> - - const: pipe >>> + maxItems: 4 >>> >>> power-domains: >>> maxItems: 1 >>> @@ -71,6 +69,42 @@ required: >>> >>> additionalProperties: false >>> >>> +allOf: >>> + - if: >>> + properties: >>> + compatible: >>> + contains: >>> + enum: >>> + - qcom,qcm2290-qmp-usb3-phy >>> + - qcom,sm6115-qmp-usb3-phy >>> + then: >>> + properties: >>> + clocks: >>> + maxItems: 4 >>> + clock-names: >>> + items: >>> + - const: cfg_ahb >>> + - const: ref >>> + - const: com_aux >>> + - const: pipe >> >> I am pretty sure I acked it and there were no changes here... but since >> you did not include it, then lets keep the clock order the same as >> sc8280xp. ABI is anyway affected, right? > > Yes, I forgot to include your Ack in this version :( > Ok, I will fix the clock order in v11. I just noticed that the clock orders are actually the same as sc8280xp. The only clock diff between sm6115 and sc8280xp is actually 'cfg_ahb' clock used by sm6115 instead of 'aux' used by sc8280xp. So, the clock order for sc8280xp is: + - const: aux + - const: ref + - const: com_aux + - const: pipe whereas the same for sm6115 is: + - const: cfg_ahb + - const: ref + - const: com_aux + - const: pipe Or, am I missing something? If not, may be I can include your Ack to help get this applied :) Thanks, Bhupesh
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..05335e6bbb58 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,7 +16,9 @@ description: properties: compatible: enum: + - qcom,qcm2290-qmp-usb3-phy - qcom,sc8280xp-qmp-usb3-uni-phy + - qcom,sm6115-qmp-usb3-phy reg: maxItems: 1 @@ -25,11 +27,7 @@ properties: maxItems: 4 clock-names: - items: - - const: aux - - const: ref - - const: com_aux - - const: pipe + maxItems: 4 power-domains: maxItems: 1 @@ -71,6 +69,42 @@ required: additionalProperties: false +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,qcm2290-qmp-usb3-phy + - qcom,sm6115-qmp-usb3-phy + then: + properties: + clocks: + maxItems: 4 + clock-names: + items: + - const: cfg_ahb + - const: ref + - const: com_aux + - const: pipe + + - 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>
'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 | 44 ++++++++++++++++--- 2 files changed, 39 insertions(+), 32 deletions(-)