| Message ID | 20230827085351.21932-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 15d63a897f79f465d71fb55cc11c6b7e20c19391 |
| Headers | show |
| Series | dt-bindings: PCI: qcom: fix SDX65 compatible | expand |
On Sun, Aug 27, 2023 at 10:53:51AM +0200, Krzysztof Kozlowski wrote: > Commit c0aba9f32801 ("dt-bindings: PCI: qcom: Add SDX65 SoC") adding > SDX65 was not ever tested and is clearly bogus. The qcom,sdx65-pcie-ep > compatible is followed by fallback in DTS and there is no driver > matching by this compatible. Driver matches by its fallback > qcom,sdx55-pcie-ep. This fixes also dtbs_check warnings like: > > qcom-sdx65-mtp.dtb: pcie-ep@1c00000: compatible: ['qcom,sdx65-pcie-ep', 'qcom,sdx55-pcie-ep'] is too long > > Fixes: c0aba9f32801 ("dt-bindings: PCI: qcom: Add SDX65 SoC") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > --- > .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > index 811112255d7d..c94b49498f69 100644 > --- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml > @@ -11,10 +11,13 @@ maintainers: > > properties: > compatible: > - enum: > - - qcom,sdx55-pcie-ep > - - qcom,sdx65-pcie-ep > - - qcom,sm8450-pcie-ep > + oneOf: > + - enum: > + - qcom,sdx55-pcie-ep > + - qcom,sm8450-pcie-ep > + - items: > + - const: qcom,sdx65-pcie-ep > + - const: qcom,sdx55-pcie-ep > > reg: > items: > @@ -110,7 +113,6 @@ allOf: > contains: > enum: > - qcom,sdx55-pcie-ep > - - qcom,sdx65-pcie-ep > then: > properties: > clocks: > -- > 2.34.1 >
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml index 811112255d7d..c94b49498f69 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml @@ -11,10 +11,13 @@ maintainers: properties: compatible: - enum: - - qcom,sdx55-pcie-ep - - qcom,sdx65-pcie-ep - - qcom,sm8450-pcie-ep + oneOf: + - enum: + - qcom,sdx55-pcie-ep + - qcom,sm8450-pcie-ep + - items: + - const: qcom,sdx65-pcie-ep + - const: qcom,sdx55-pcie-ep reg: items: @@ -110,7 +113,6 @@ allOf: contains: enum: - qcom,sdx55-pcie-ep - - qcom,sdx65-pcie-ep then: properties: clocks:
Commit c0aba9f32801 ("dt-bindings: PCI: qcom: Add SDX65 SoC") adding SDX65 was not ever tested and is clearly bogus. The qcom,sdx65-pcie-ep compatible is followed by fallback in DTS and there is no driver matching by this compatible. Driver matches by its fallback qcom,sdx55-pcie-ep. This fixes also dtbs_check warnings like: qcom-sdx65-mtp.dtb: pcie-ep@1c00000: compatible: ['qcom,sdx65-pcie-ep', 'qcom,sdx55-pcie-ep'] is too long Fixes: c0aba9f32801 ("dt-bindings: PCI: qcom: Add SDX65 SoC") Cc: <stable@vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)