diff mbox series

[1/3] dt-bindings: PCI: layerscape-pci: Replace fsl,lx2160a-pcie with fsl,lx2160ar2-pcie

Message ID 20240826-2160r2-v1-1-106340d538d6@nxp.com
State New
Headers show
Series arm64: dts: PCI: lx2160 use fsl,lx2160ar2-pcie | expand

Commit Message

Frank Li Aug. 26, 2024, 9:38 p.m. UTC
fsl,lx2160a-pcie compatible is used for mobivel according to
Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt

fsl,layerscape-pcie.yaml is used for designware PCIe controller binding. So
change it to fsl,lx2160ar2-pcie and allow fall back to fsl,ls2088a-pcie.

Sort compatible string.

Fixes: 24cd7ecb3886 ("dt-bindings: PCI: layerscape-pci: Convert to YAML format")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 .../bindings/pci/fsl,layerscape-pcie.yaml          | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

Comments

Rob Herring (Arm) Aug. 27, 2024, 4:07 p.m. UTC | #1
On Mon, 26 Aug 2024 17:38:32 -0400, Frank Li wrote:
> fsl,lx2160a-pcie compatible is used for mobivel according to
> Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
> 
> fsl,layerscape-pcie.yaml is used for designware PCIe controller binding. So
> change it to fsl,lx2160ar2-pcie and allow fall back to fsl,ls2088a-pcie.
> 
> Sort compatible string.
> 
> Fixes: 24cd7ecb3886 ("dt-bindings: PCI: layerscape-pci: Convert to YAML format")
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>  .../bindings/pci/fsl,layerscape-pcie.yaml          | 26 ++++++++++++----------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 

Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Conor Dooley Aug. 27, 2024, 4:14 p.m. UTC | #2
On Mon, Aug 26, 2024 at 05:38:32PM -0400, Frank Li wrote:
> fsl,lx2160a-pcie compatible is used for mobivel according to
> Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
> 
> fsl,layerscape-pcie.yaml is used for designware PCIe controller binding. So
> change it to fsl,lx2160ar2-pcie and allow fall back to fsl,ls2088a-pcie.
> 
> Sort compatible string.
> 
> Fixes: 24cd7ecb3886 ("dt-bindings: PCI: layerscape-pci: Convert to YAML format")

I don't understand what this fixes tag is for, this is a brand new
compatible that you are adding, why does it need a fixes tag pointing to
the conversion?

> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>  .../bindings/pci/fsl,layerscape-pcie.yaml          | 26 ++++++++++++----------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
> index 793986c5af7ff..daeab5c0758d1 100644
> --- a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
> +++ b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
> @@ -22,18 +22,20 @@ description:
>  
>  properties:
>    compatible:
> -    enum:
> -      - fsl,ls1021a-pcie
> -      - fsl,ls2080a-pcie
> -      - fsl,ls2085a-pcie
> -      - fsl,ls2088a-pcie
> -      - fsl,ls1088a-pcie
> -      - fsl,ls1046a-pcie
> -      - fsl,ls1043a-pcie
> -      - fsl,ls1012a-pcie
> -      - fsl,ls1028a-pcie
> -      - fsl,lx2160a-pcie
> -
> +    oneOf:
> +      - enum:
> +          - fsl,ls1012a-pcie
> +          - fsl,ls1021a-pcie
> +          - fsl,ls1028a-pcie
> +          - fsl,ls1043a-pcie
> +          - fsl,ls1046a-pcie
> +          - fsl,ls1088a-pcie
> +          - fsl,ls2080a-pcie
> +          - fsl,ls2085a-pcie
> +          - fsl,ls2088a-pcie
> +      - items:
> +          - const: fsl,lx2160ar2-pcie
> +          - const: fsl,ls2088a-pcie
>    reg:
>      maxItems: 2
>  
> 
> -- 
> 2.34.1
>
Frank Li Aug. 27, 2024, 4:32 p.m. UTC | #3
On Tue, Aug 27, 2024 at 05:14:32PM +0100, Conor Dooley wrote:
> On Mon, Aug 26, 2024 at 05:38:32PM -0400, Frank Li wrote:
> > fsl,lx2160a-pcie compatible is used for mobivel according to
> > Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
> >
> > fsl,layerscape-pcie.yaml is used for designware PCIe controller binding. So
> > change it to fsl,lx2160ar2-pcie and allow fall back to fsl,ls2088a-pcie.
> >
> > Sort compatible string.
> >
> > Fixes: 24cd7ecb3886 ("dt-bindings: PCI: layerscape-pci: Convert to YAML format")
>
> I don't understand what this fixes tag is for, this is a brand new
> compatible that you are adding, why does it need a fixes tag pointing to
> the conversion?

Because previous convert wrongly included "fsl,lx2160a-pcie" here, which
already used for mobivel pci controler, descripted in
layerscape-pcie-gen4.txt.

This patch fix this problem, rename fsl,lx2160a-pcie to fsl,lx2160ar2-pcie

>
> > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > ---
> >  .../bindings/pci/fsl,layerscape-pcie.yaml          | 26 ++++++++++++----------
> >  1 file changed, 14 insertions(+), 12 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
> > index 793986c5af7ff..daeab5c0758d1 100644
> > --- a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
> > +++ b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
> > @@ -22,18 +22,20 @@ description:
> >
> >  properties:
> >    compatible:
> > -    enum:
> > -      - fsl,ls1021a-pcie
> > -      - fsl,ls2080a-pcie
> > -      - fsl,ls2085a-pcie
> > -      - fsl,ls2088a-pcie
> > -      - fsl,ls1088a-pcie
> > -      - fsl,ls1046a-pcie
> > -      - fsl,ls1043a-pcie
> > -      - fsl,ls1012a-pcie
> > -      - fsl,ls1028a-pcie
> > -      - fsl,lx2160a-pcie
> > -
> > +    oneOf:
> > +      - enum:
> > +          - fsl,ls1012a-pcie
> > +          - fsl,ls1021a-pcie
> > +          - fsl,ls1028a-pcie
> > +          - fsl,ls1043a-pcie
> > +          - fsl,ls1046a-pcie
> > +          - fsl,ls1088a-pcie
> > +          - fsl,ls2080a-pcie
> > +          - fsl,ls2085a-pcie
> > +          - fsl,ls2088a-pcie
> > +      - items:
> > +          - const: fsl,lx2160ar2-pcie
> > +          - const: fsl,ls2088a-pcie
> >    reg:
> >      maxItems: 2
> >
> >
> > --
> > 2.34.1
> >
Conor Dooley Aug. 27, 2024, 4:56 p.m. UTC | #4
On Tue, Aug 27, 2024 at 12:32:42PM -0400, Frank Li wrote:
> On Tue, Aug 27, 2024 at 05:14:32PM +0100, Conor Dooley wrote:
> > On Mon, Aug 26, 2024 at 05:38:32PM -0400, Frank Li wrote:
> > > fsl,lx2160a-pcie compatible is used for mobivel according to
> > > Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
> > >
> > > fsl,layerscape-pcie.yaml is used for designware PCIe controller binding. So
> > > change it to fsl,lx2160ar2-pcie and allow fall back to fsl,ls2088a-pcie.
> > >
> > > Sort compatible string.
> > >
> > > Fixes: 24cd7ecb3886 ("dt-bindings: PCI: layerscape-pci: Convert to YAML format")
> >
> > I don't understand what this fixes tag is for, this is a brand new
> > compatible that you are adding, why does it need a fixes tag pointing to
> > the conversion?
> 
> Because previous convert wrongly included "fsl,lx2160a-pcie" here, which
> already used for mobivel pci controler, descripted in
> layerscape-pcie-gen4.txt.
> 
> This patch fix this problem, rename fsl,lx2160a-pcie to fsl,lx2160ar2-pcie

Ah, I see that now. Lost in the noise of reordering the list first time
around.
Krzysztof WilczyƄski Sept. 4, 2024, 2:46 p.m. UTC | #5
Hello,

> fsl,lx2160a-pcie compatible is used for mobivel according to
> Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
> 
> fsl,layerscape-pcie.yaml is used for designware PCIe controller binding. So
> change it to fsl,lx2160ar2-pcie and allow fall back to fsl,ls2088a-pcie.
> 
> Sort compatible string.

Applied to dt-bindings, thank you!

[1/1] dt-bindings: PCI: layerscape-pci: Replace fsl,lx2160a-pcie with fsl,lx2160ar2-pcie
      https://git.kernel.org/pci/pci/c/1a1bf58897d2

	Krzysztof
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
index 793986c5af7ff..daeab5c0758d1 100644
--- a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
@@ -22,18 +22,20 @@  description:
 
 properties:
   compatible:
-    enum:
-      - fsl,ls1021a-pcie
-      - fsl,ls2080a-pcie
-      - fsl,ls2085a-pcie
-      - fsl,ls2088a-pcie
-      - fsl,ls1088a-pcie
-      - fsl,ls1046a-pcie
-      - fsl,ls1043a-pcie
-      - fsl,ls1012a-pcie
-      - fsl,ls1028a-pcie
-      - fsl,lx2160a-pcie
-
+    oneOf:
+      - enum:
+          - fsl,ls1012a-pcie
+          - fsl,ls1021a-pcie
+          - fsl,ls1028a-pcie
+          - fsl,ls1043a-pcie
+          - fsl,ls1046a-pcie
+          - fsl,ls1088a-pcie
+          - fsl,ls2080a-pcie
+          - fsl,ls2085a-pcie
+          - fsl,ls2088a-pcie
+      - items:
+          - const: fsl,lx2160ar2-pcie
+          - const: fsl,ls2088a-pcie
   reg:
     maxItems: 2