| Message ID | 20240402192555.1955204-3-mr.nuke.me@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Manivannan Sadhasivam |
| Headers | show |
| Series | None | expand |
On 02/04/2024 21:25, Alexandru Gagniuc wrote: > IPQ9574 has PCIe controllers which are almost identical to IPQ6018. > The only difference is that the "iface" clock is not required. > Document this difference along with the compatible string. > > Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> > --- > .../devicetree/bindings/pci/qcom,pcie.yaml | 32 +++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml > index cf9a6910b542..6eb29547c18e 100644 > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml > @@ -26,6 +26,7 @@ properties: > - qcom,pcie-ipq8064-v2 > - qcom,pcie-ipq8074 > - qcom,pcie-ipq8074-gen3 > + - qcom,pcie-ipq9574 > - qcom,pcie-msm8996 > - qcom,pcie-qcs404 > - qcom,pcie-sdm845 > @@ -383,6 +384,35 @@ allOf: > - const: axi_s # AXI Slave clock > - const: axi_bridge # AXI bridge clock > - const: rchng > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,pcie-ipq9574 > + then: > + properties: > + clocks: > + minItems: 4 > + maxItems: 4 > + clock-names: > + items: > + - const: axi_m # AXI Master clock > + - const: axi_s # AXI Slave clock > + - const: axi_bridge # AXI bridge clock > + - const: rchng > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,pcie-ipq6018 > + - qcom,pcie-ipq8074-gen3 > + - qcom,pcie-ipq9574 > + then: Do not introduce inconsistent style. All if:then: define both clocks and resets, right? And after your patch not anymore? Best regards, Krzysztof
On 4/3/24 02:14, Krzysztof Kozlowski wrote: > On 02/04/2024 21:25, Alexandru Gagniuc wrote: >> IPQ9574 has PCIe controllers which are almost identical to IPQ6018. >> The only difference is that the "iface" clock is not required. >> Document this difference along with the compatible string. >> >> Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> >> --- >> .../devicetree/bindings/pci/qcom,pcie.yaml | 32 +++++++++++++++++++ >> 1 file changed, 32 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml >> index cf9a6910b542..6eb29547c18e 100644 >> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml >> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml >> @@ -26,6 +26,7 @@ properties: >> - qcom,pcie-ipq8064-v2 >> - qcom,pcie-ipq8074 >> - qcom,pcie-ipq8074-gen3 >> + - qcom,pcie-ipq9574 >> - qcom,pcie-msm8996 >> - qcom,pcie-qcs404 >> - qcom,pcie-sdm845 >> @@ -383,6 +384,35 @@ allOf: >> - const: axi_s # AXI Slave clock >> - const: axi_bridge # AXI bridge clock >> - const: rchng >> + >> + - if: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - qcom,pcie-ipq9574 >> + then: >> + properties: >> + clocks: >> + minItems: 4 >> + maxItems: 4 >> + clock-names: >> + items: >> + - const: axi_m # AXI Master clock >> + - const: axi_s # AXI Slave clock >> + - const: axi_bridge # AXI bridge clock >> + - const: rchng >> + >> + - if: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - qcom,pcie-ipq6018 >> + - qcom,pcie-ipq8074-gen3 >> + - qcom,pcie-ipq9574 >> + then: > > Do not introduce inconsistent style. All if:then: define both clocks and > resets, right? And after your patch not anymore? > I kept the resets in one place because they are the same cross the ipq* variants. Do I understand correctly that you wish me to split up the resets as well? if ipq8074 ipq6018 clocks resets if ipq9754 clocks resets Alex > Best regards, > Krzysztof >
On 03/04/2024 20:05, mr.nuke.me@gmail.com wrote: > > > On 4/3/24 02:14, Krzysztof Kozlowski wrote: >> On 02/04/2024 21:25, Alexandru Gagniuc wrote: >>> IPQ9574 has PCIe controllers which are almost identical to IPQ6018. >>> The only difference is that the "iface" clock is not required. >>> Document this difference along with the compatible string. >>> >>> Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> >>> --- >>> .../devicetree/bindings/pci/qcom,pcie.yaml | 32 +++++++++++++++++++ >>> 1 file changed, 32 insertions(+) >>> >>> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml >>> index cf9a6910b542..6eb29547c18e 100644 >>> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml >>> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml >>> @@ -26,6 +26,7 @@ properties: >>> - qcom,pcie-ipq8064-v2 >>> - qcom,pcie-ipq8074 >>> - qcom,pcie-ipq8074-gen3 >>> + - qcom,pcie-ipq9574 >>> - qcom,pcie-msm8996 >>> - qcom,pcie-qcs404 >>> - qcom,pcie-sdm845 >>> @@ -383,6 +384,35 @@ allOf: >>> - const: axi_s # AXI Slave clock >>> - const: axi_bridge # AXI bridge clock >>> - const: rchng >>> + >>> + - if: >>> + properties: >>> + compatible: >>> + contains: >>> + enum: >>> + - qcom,pcie-ipq9574 >>> + then: >>> + properties: >>> + clocks: >>> + minItems: 4 >>> + maxItems: 4 >>> + clock-names: >>> + items: >>> + - const: axi_m # AXI Master clock >>> + - const: axi_s # AXI Slave clock >>> + - const: axi_bridge # AXI bridge clock >>> + - const: rchng >>> + >>> + - if: >>> + properties: >>> + compatible: >>> + contains: >>> + enum: >>> + - qcom,pcie-ipq6018 >>> + - qcom,pcie-ipq8074-gen3 >>> + - qcom,pcie-ipq9574 >>> + then: >> >> Do not introduce inconsistent style. All if:then: define both clocks and >> resets, right? And after your patch not anymore? >> > I kept the resets in one place because they are the same cross the ipq* > variants. > > Do I understand correctly that you wish me to split up the resets as well? > > if ipq8074 ipq6018 > clocks > resets > > if ipq9754 > clocks > resets Yes, keep it consistent with all other cases. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index cf9a6910b542..6eb29547c18e 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -26,6 +26,7 @@ properties: - qcom,pcie-ipq8064-v2 - qcom,pcie-ipq8074 - qcom,pcie-ipq8074-gen3 + - qcom,pcie-ipq9574 - qcom,pcie-msm8996 - qcom,pcie-qcs404 - qcom,pcie-sdm845 @@ -383,6 +384,35 @@ allOf: - const: axi_s # AXI Slave clock - const: axi_bridge # AXI bridge clock - const: rchng + + - if: + properties: + compatible: + contains: + enum: + - qcom,pcie-ipq9574 + then: + properties: + clocks: + minItems: 4 + maxItems: 4 + clock-names: + items: + - const: axi_m # AXI Master clock + - const: axi_s # AXI Slave clock + - const: axi_bridge # AXI bridge clock + - const: rchng + + - if: + properties: + compatible: + contains: + enum: + - qcom,pcie-ipq6018 + - qcom,pcie-ipq8074-gen3 + - qcom,pcie-ipq9574 + then: + properties: resets: minItems: 8 maxItems: 8 @@ -507,6 +537,7 @@ allOf: - qcom,pcie-ipq8064v2 - qcom,pcie-ipq8074 - qcom,pcie-ipq8074-gen3 + - qcom,pcie-ipq9574 - qcom,pcie-qcs404 then: required: @@ -566,6 +597,7 @@ allOf: - qcom,pcie-ipq8064-v2 - qcom,pcie-ipq8074 - qcom,pcie-ipq8074-gen3 + - qcom,pcie-ipq9574 - qcom,pcie-qcs404 then: properties:
IPQ9574 has PCIe controllers which are almost identical to IPQ6018. The only difference is that the "iface" clock is not required. Document this difference along with the compatible string. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> --- .../devicetree/bindings/pci/qcom,pcie.yaml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+)