Message ID | 20230406194703.495836-3-brgl@bgdev.pl (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | arm64: qcom: sa8775p: add support for UFS | expand |
On 06/04/2023 21:47, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > Add a new compatible for the QMP UFS PHY found on sa8775p platforms and > update the clocks property to accommodate three clocks. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > --- > .../phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 26 ++++++++++++++++++- > 1 file changed, 25 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > index cd0fbbd3593d..5bc93acccbad 100644 > --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > @@ -16,6 +16,7 @@ description: > properties: > compatible: > enum: > + - qcom,sa8775p-qmp-ufs-phy > - qcom,sc8280xp-qmp-ufs-phy > - qcom,sm6125-qmp-ufs-phy > - qcom,sm7150-qmp-ufs-phy > @@ -25,12 +26,15 @@ properties: > maxItems: 1 > > clocks: > - maxItems: 2 > + minItems: 2 > + maxItems: 3 > > clock-names: > + minItems: 2 > items: > - const: ref > - const: ref_aux > + - const: qref > > power-domains: > maxItems: 1 > @@ -52,6 +56,26 @@ properties: > "#phy-cells": > const: 0 > > +allOf: I should notice wrong different placement before. allOf: blocks goes just like in example-schema, so after required:. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,sa8775p-qmp-ufs-phy > + then: > + properties: > + clocks: > + maxItems: 3 > + clock-names: > + maxItems: 3 > + else: > + properties: > + clocks: > + maxItems: 2 > + clock-names: > + maxItems: 2 > + > required: > - compatible > - reg Best regards, Krzysztof
On Thu, Apr 06, 2023 at 09:47:00PM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > Add a new compatible for the QMP UFS PHY found on sa8775p platforms and > update the clocks property to accommodate three clocks. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > --- > .../phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 26 ++++++++++++++++++- > 1 file changed, 25 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > index cd0fbbd3593d..5bc93acccbad 100644 > --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > @@ -16,6 +16,7 @@ description: > properties: > compatible: > enum: > + - qcom,sa8775p-qmp-ufs-phy > - qcom,sc8280xp-qmp-ufs-phy > - qcom,sm6125-qmp-ufs-phy > - qcom,sm7150-qmp-ufs-phy > @@ -25,12 +26,15 @@ properties: > maxItems: 1 > > clocks: > - maxItems: 2 > + minItems: 2 > + maxItems: 3 > > clock-names: > + minItems: 2 > items: > - const: ref > - const: ref_aux > + - const: qref > > power-domains: > maxItems: 1 > @@ -52,6 +56,26 @@ properties: > "#phy-cells": > const: 0 > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,sa8775p-qmp-ufs-phy > + then: > + properties: > + clocks: > + maxItems: 3 > + clock-names: > + maxItems: 3 The max is already 3. Did you mean 'minItems: 3' or 2 or 3 clocks are valid? > + else: > + properties: > + clocks: > + maxItems: 2 > + clock-names: > + maxItems: 2 > + > required: > - compatible > - reg > -- > 2.37.2 >
On Tue, 11 Apr 2023 at 15:17, Rob Herring <robh@kernel.org> wrote: > > On Thu, Apr 06, 2023 at 09:47:00PM +0200, Bartosz Golaszewski wrote: > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > Add a new compatible for the QMP UFS PHY found on sa8775p platforms and > > update the clocks property to accommodate three clocks. > > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > --- > > .../phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 26 ++++++++++++++++++- > > 1 file changed, 25 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > > index cd0fbbd3593d..5bc93acccbad 100644 > > --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > > +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml > > @@ -16,6 +16,7 @@ description: > > properties: > > compatible: > > enum: > > + - qcom,sa8775p-qmp-ufs-phy > > - qcom,sc8280xp-qmp-ufs-phy > > - qcom,sm6125-qmp-ufs-phy > > - qcom,sm7150-qmp-ufs-phy > > @@ -25,12 +26,15 @@ properties: > > maxItems: 1 > > > > clocks: > > - maxItems: 2 > > + minItems: 2 > > + maxItems: 3 > > > > clock-names: > > + minItems: 2 > > items: > > - const: ref > > - const: ref_aux > > + - const: qref > > > > power-domains: > > maxItems: 1 > > @@ -52,6 +56,26 @@ properties: > > "#phy-cells": > > const: 0 > > > > +allOf: > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - qcom,sa8775p-qmp-ufs-phy > > + then: > > + properties: > > + clocks: > > + maxItems: 3 > > + clock-names: > > + maxItems: 3 > > The max is already 3. Did you mean 'minItems: 3' or 2 or 3 clocks are > valid? > For this compatible only 3 clocks are valid so it should have been minItems indeed. Bartosz > > + else: > > + properties: > > + clocks: > > + maxItems: 2 > > + clock-names: > > + maxItems: 2 > > + > > required: > > - compatible > > - reg > > -- > > 2.37.2 > >
diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml index cd0fbbd3593d..5bc93acccbad 100644 --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml @@ -16,6 +16,7 @@ description: properties: compatible: enum: + - qcom,sa8775p-qmp-ufs-phy - qcom,sc8280xp-qmp-ufs-phy - qcom,sm6125-qmp-ufs-phy - qcom,sm7150-qmp-ufs-phy @@ -25,12 +26,15 @@ properties: maxItems: 1 clocks: - maxItems: 2 + minItems: 2 + maxItems: 3 clock-names: + minItems: 2 items: - const: ref - const: ref_aux + - const: qref power-domains: maxItems: 1 @@ -52,6 +56,26 @@ properties: "#phy-cells": const: 0 +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,sa8775p-qmp-ufs-phy + then: + properties: + clocks: + maxItems: 3 + clock-names: + maxItems: 3 + else: + properties: + clocks: + maxItems: 2 + clock-names: + maxItems: 2 + required: - compatible - reg