| Message ID | 20250221-sar2130p-pci-v3-4-61a0fdfb75b4@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | PCI: qcom-ep: add support for using the EP on SAR2130P and SM8450 | expand |
On Fri, Feb 21, 2025 at 05:52:02PM +0200, Dmitry Baryshkov wrote: > On Qualcomm platforms here are two major kinds of PCIe EP controllers: > ones which use eDMA and IOMMU and the ones which do not (like SDX55 / > SDX65). It doesn't make sense to c&p similar properties all over the > place. Merge these two usecases into a single conditional clause. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 68 +++++++++++----------- > 1 file changed, 35 insertions(+), 33 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > index d22022ff2760c5aa84d31e3c719dd4b63adbb4cf..2c1918ca30dcfa8decea684ff6bfe11c602bbc7e 100644 > --- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > @@ -131,6 +131,7 @@ required: > > allOf: > - $ref: pci-ep.yaml# > + > - if: > properties: > compatible: > @@ -140,9 +141,43 @@ allOf: > then: > properties: > reg: > + minItems: 6 That's not really necessary - minItems: 6 is in the top level. It doesn't hurt, though. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Fri, Feb 21, 2025 at 05:52:02PM +0200, Dmitry Baryshkov wrote: > On Qualcomm platforms here are two major kinds of PCIe EP controllers: > ones which use eDMA and IOMMU and the ones which do not (like SDX55 / > SDX65). It doesn't make sense to c&p similar properties all over the > place. Merge these two usecases into a single conditional clause. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 68 +++++++++++----------- > 1 file changed, 35 insertions(+), 33 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > index d22022ff2760c5aa84d31e3c719dd4b63adbb4cf..2c1918ca30dcfa8decea684ff6bfe11c602bbc7e 100644 > --- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > @@ -131,6 +131,7 @@ required: > > allOf: > - $ref: pci-ep.yaml# > + > - if: > properties: > compatible: > @@ -140,9 +141,43 @@ allOf: > then: > properties: > reg: > + minItems: 6 > maxItems: 6 > reg-names: > + minItems: 6 > maxItems: 6 > + interrupts: > + minItems: 2 > + maxItems: 2 > + interrupt-names: > + minItems: 2 > + maxItems: 2 > + iommus: false > + else: > + properties: > + reg: > + minItems: 7 > + maxItems: 7 > + reg-names: > + minItems: 7 > + maxItems: 7 > + interrupts: > + minItems: 3 > + maxItems: 3 > + interrupt-names: > + minItems: 3 > + maxItems: 3 > + required: > + - iommus > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,sdx55-pcie-ep > + then: > + properties: > clocks: > items: > - description: PCIe Auxiliary clock > @@ -161,11 +196,6 @@ allOf: > - const: slave_q2a > - const: sleep > - const: ref > - interrupts: > - maxItems: 2 > - interrupt-names: > - maxItems: 2 > - iommus: false > > - if: > properties: > @@ -175,12 +205,6 @@ allOf: > - qcom,sm8450-pcie-ep > then: > properties: > - reg: > - minItems: 7 > - maxItems: 7 > - reg-names: > - minItems: 7 > - maxItems: 7 > clocks: > items: > - description: PCIe Auxiliary clock > @@ -201,14 +225,6 @@ allOf: > - const: ref > - const: ddrss_sf_tbu > - const: aggre_noc_axi > - interrupts: > - minItems: 3 > - maxItems: 3 > - interrupt-names: > - minItems: 3 > - maxItems: 3 > - required: > - - iommus > > - if: > properties: > @@ -218,12 +234,6 @@ allOf: > - qcom,sa8775p-pcie-ep > then: > properties: > - reg: > - minItems: 7 > - maxItems: 7 > - reg-names: > - minItems: 7 > - maxItems: 7 > clocks: > items: > - description: PCIe Auxiliary clock > @@ -238,14 +248,6 @@ allOf: > - const: bus_master > - const: bus_slave > - const: slave_q2a > - interrupts: > - minItems: 3 > - maxItems: 3 > - interrupt-names: > - minItems: 3 > - maxItems: 3 > - required: > - - iommus > > unevaluatedProperties: false > > > -- > 2.39.5 >
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml index d22022ff2760c5aa84d31e3c719dd4b63adbb4cf..2c1918ca30dcfa8decea684ff6bfe11c602bbc7e 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml @@ -131,6 +131,7 @@ required: allOf: - $ref: pci-ep.yaml# + - if: properties: compatible: @@ -140,9 +141,43 @@ allOf: then: properties: reg: + minItems: 6 maxItems: 6 reg-names: + minItems: 6 maxItems: 6 + interrupts: + minItems: 2 + maxItems: 2 + interrupt-names: + minItems: 2 + maxItems: 2 + iommus: false + else: + properties: + reg: + minItems: 7 + maxItems: 7 + reg-names: + minItems: 7 + maxItems: 7 + interrupts: + minItems: 3 + maxItems: 3 + interrupt-names: + minItems: 3 + maxItems: 3 + required: + - iommus + + - if: + properties: + compatible: + contains: + enum: + - qcom,sdx55-pcie-ep + then: + properties: clocks: items: - description: PCIe Auxiliary clock @@ -161,11 +196,6 @@ allOf: - const: slave_q2a - const: sleep - const: ref - interrupts: - maxItems: 2 - interrupt-names: - maxItems: 2 - iommus: false - if: properties: @@ -175,12 +205,6 @@ allOf: - qcom,sm8450-pcie-ep then: properties: - reg: - minItems: 7 - maxItems: 7 - reg-names: - minItems: 7 - maxItems: 7 clocks: items: - description: PCIe Auxiliary clock @@ -201,14 +225,6 @@ allOf: - const: ref - const: ddrss_sf_tbu - const: aggre_noc_axi - interrupts: - minItems: 3 - maxItems: 3 - interrupt-names: - minItems: 3 - maxItems: 3 - required: - - iommus - if: properties: @@ -218,12 +234,6 @@ allOf: - qcom,sa8775p-pcie-ep then: properties: - reg: - minItems: 7 - maxItems: 7 - reg-names: - minItems: 7 - maxItems: 7 clocks: items: - description: PCIe Auxiliary clock @@ -238,14 +248,6 @@ allOf: - const: bus_master - const: bus_slave - const: slave_q2a - interrupts: - minItems: 3 - maxItems: 3 - interrupt-names: - minItems: 3 - maxItems: 3 - required: - - iommus unevaluatedProperties: false
On Qualcomm platforms here are two major kinds of PCIe EP controllers: ones which use eDMA and IOMMU and the ones which do not (like SDX55 / SDX65). It doesn't make sense to c&p similar properties all over the place. Merge these two usecases into a single conditional clause. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 68 +++++++++++----------- 1 file changed, 35 insertions(+), 33 deletions(-)