[PATCH v1 0/3] Remove unnecessary version number

[PATCH v1 0/3] Remove unnecessary version number

[Bharat Kumar Gogada]

This patch series removes unnecessary version number in compatible string.
The device tree documentation reg names are rearranged to align with
node name.

Bharat Kumar Gogada (3):
  dt-bindings: PCI: xilinx-cpm: Remove version number in compatible
    string
  PCI: xilinx-cpm: Remove version number in compatible string
  dt-bindings: PCI: xilinx-cpm: Change reg property order

 .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 14 +++++++-------
 drivers/pci/controller/pcie-xilinx-cpm.c           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

-- 
2.17.1

[PATCH v1 1/3] dt-bindings: PCI: xilinx-cpm: Remove version number in compatible string

[Bharat Kumar Gogada]

Removing unnecessary version number in compatible string.

Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
---
 Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
index 32f4641085bc..4ebcc838a1f6 100644
--- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
+++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
@@ -14,7 +14,7 @@ allOf:
 
 properties:
   compatible:
-    const: xlnx,versal-cpm-host-1.00
+    const: xlnx,versal-cpm-host
 
   reg:
     items:
@@ -70,7 +70,7 @@ examples:
                #address-cells = <2>;
                #size-cells = <2>;
                cpm_pcie: pcie@fca10000 {
-                       compatible = "xlnx,versal-cpm-host-1.00";
+                       compatible = "xlnx,versal-cpm-host";
                        device_type = "pci";
                        #address-cells = <3>;
                        #interrupt-cells = <1>;
-- 
2.17.1

Re: [PATCH v1 1/3] dt-bindings: PCI: xilinx-cpm: Remove version number in compatible string

[Michal Simek]

On 4/14/22 11:22, Bharat Kumar Gogada wrote:
> Removing unnecessary version number in compatible string.

I am missing reason for this in commit message.

> 
> Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
> ---
>   Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> index 32f4641085bc..4ebcc838a1f6 100644
> --- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> +++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> @@ -14,7 +14,7 @@ allOf:
>   
>   properties:
>     compatible:
> -    const: xlnx,versal-cpm-host-1.00
> +    const: xlnx,versal-cpm-host

And this is likely breaking compatibility for existing DTs.

M

>   
>     reg:
>       items:
> @@ -70,7 +70,7 @@ examples:
>                  #address-cells = <2>;
>                  #size-cells = <2>;
>                  cpm_pcie: pcie@fca10000 {
> -                       compatible = "xlnx,versal-cpm-host-1.00";
> +                       compatible = "xlnx,versal-cpm-host";
>                          device_type = "pci";
>                          #address-cells = <3>;
>                          #interrupt-cells = <1>;

Re: [PATCH v1 1/3] dt-bindings: PCI: xilinx-cpm: Remove version number in compatible string

[Bjorn Helgaas]

On Thu, Apr 14, 2022 at 02:46:25PM +0200, Michal Simek wrote:
> On 4/14/22 11:22, Bharat Kumar Gogada wrote:
> > Removing unnecessary version number in compatible string.
> 
> I am missing reason for this in commit message.

Agreed.  The commit log for the pcie-xilinx-cpm.c change also needs to
explain why removing the version is useful and safe.

> > Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
> > ---
> >   Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > index 32f4641085bc..4ebcc838a1f6 100644
> > --- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > +++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > @@ -14,7 +14,7 @@ allOf:
> >   properties:
> >     compatible:
> > -    const: xlnx,versal-cpm-host-1.00
> > +    const: xlnx,versal-cpm-host
> 
> And this is likely breaking compatibility for existing DTs.
> 
> M
> 
> >     reg:
> >       items:
> > @@ -70,7 +70,7 @@ examples:
> >                  #address-cells = <2>;
> >                  #size-cells = <2>;
> >                  cpm_pcie: pcie@fca10000 {
> > -                       compatible = "xlnx,versal-cpm-host-1.00";
> > +                       compatible = "xlnx,versal-cpm-host";
> >                          device_type = "pci";
> >                          #address-cells = <3>;
> >                          #interrupt-cells = <1>;

RE: [PATCH v1 1/3] dt-bindings: PCI: xilinx-cpm: Remove version number in compatible string

[Bharat Kumar Gogada]

> On Thu, Apr 14, 2022 at 02:46:25PM +0200, Michal Simek wrote:
> > On 4/14/22 11:22, Bharat Kumar Gogada wrote:
> > > Removing unnecessary version number in compatible string.
> >
> > I am missing reason for this in commit message.
> 
> Agreed.  The commit log for the pcie-xilinx-cpm.c change also needs to
> explain why removing the version is useful and safe.

HI Bjorn, Michal, 

The CPM block is hard block, Rob pointed out that versioning has no value here.
Will resend patch with this detail.

Regards,
Bharat

> 
> > > Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
> > > ---
> > >   Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml | 4 ++--
> > >   1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git
> > > a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > > b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > > index 32f4641085bc..4ebcc838a1f6 100644
> > > --- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > > +++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> > > @@ -14,7 +14,7 @@ allOf:
> > >   properties:
> > >     compatible:
> > > -    const: xlnx,versal-cpm-host-1.00
> > > +    const: xlnx,versal-cpm-host
> >
> > And this is likely breaking compatibility for existing DTs.
> >
> > M
> >
> > >     reg:
> > >       items:
> > > @@ -70,7 +70,7 @@ examples:
> > >                  #address-cells = <2>;
> > >                  #size-cells = <2>;
> > >                  cpm_pcie: pcie@fca10000 {
> > > -                       compatible = "xlnx,versal-cpm-host-1.00";
> > > +                       compatible = "xlnx,versal-cpm-host";
> > >                          device_type = "pci";
> > >                          #address-cells = <3>;
> > >                          #interrupt-cells = <1>;

Re: [PATCH v1 1/3] dt-bindings: PCI: xilinx-cpm: Remove version number in compatible string

[Rob Herring]

On Tue, Apr 19, 2022 at 7:22 AM Bharat Kumar Gogada <bharatku@xilinx.com> wrote:
>
> > On Thu, Apr 14, 2022 at 02:46:25PM +0200, Michal Simek wrote:
> > > On 4/14/22 11:22, Bharat Kumar Gogada wrote:
> > > > Removing unnecessary version number in compatible string.
> > >
> > > I am missing reason for this in commit message.
> >
> > Agreed.  The commit log for the pcie-xilinx-cpm.c change also needs to
> > explain why removing the version is useful and safe.
>
> HI Bjorn, Michal,
>
> The CPM block is hard block, Rob pointed out that versioning has no value here.
> Will resend patch with this detail.

I did not say to remove the existing version breaking compatibility.
Just don't continue to add new version numbers.

Rob

RE: [PATCH v1 1/3] dt-bindings: PCI: xilinx-cpm: Remove version number in compatible string

[Bharat Kumar Gogada]

 
> On Tue, Apr 19, 2022 at 7:22 AM Bharat Kumar Gogada
> <bharatku@xilinx.com> wrote:
> >
> > > On Thu, Apr 14, 2022 at 02:46:25PM +0200, Michal Simek wrote:
> > > > On 4/14/22 11:22, Bharat Kumar Gogada wrote:
> > > > > Removing unnecessary version number in compatible string.
> > > >
> > > > I am missing reason for this in commit message.
> > >
> > > Agreed.  The commit log for the pcie-xilinx-cpm.c change also needs
> > > to explain why removing the version is useful and safe.
> >
> > HI Bjorn, Michal,
> >
> > The CPM block is hard block, Rob pointed out that versioning has no value
> here.
> > Will resend patch with this detail.
> 
> I did not say to remove the existing version breaking compatibility.
> Just don't continue to add new version numbers.
> 
Thanks Rob.

[PATCH v1 2/3] PCI: xilinx-cpm: Remove version number in compatible string

[Bharat Kumar Gogada]

Remove unnecessary version number in compatible string.

Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
---
 drivers/pci/controller/pcie-xilinx-cpm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/controller/pcie-xilinx-cpm.c
index c7cd44ed4dfc..52bc74335584 100644
--- a/drivers/pci/controller/pcie-xilinx-cpm.c
+++ b/drivers/pci/controller/pcie-xilinx-cpm.c
@@ -592,7 +592,7 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id xilinx_cpm_pcie_of_match[] = {
-	{ .compatible = "xlnx,versal-cpm-host-1.00", },
+	{ .compatible = "xlnx,versal-cpm-host", },
 	{}
 };
 
-- 
2.17.1

[PATCH v1 3/3] dt-bindings: PCI: xilinx-cpm: Change reg property order

[Bharat Kumar Gogada]

Describe cpm reg property name before cfg reg property to align with
node name.

Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
---
 .../devicetree/bindings/pci/xilinx-versal-cpm.yaml     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
index 4ebcc838a1f6..a3bc6ed9cf95 100644
--- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
+++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
@@ -18,13 +18,13 @@ properties:
 
   reg:
     items:
-      - description: Configuration space region and bridge registers.
       - description: CPM system level control and status registers.
+      - description: Configuration space region and bridge registers.
 
   reg-names:
     items:
-      - const: cfg
       - const: cpm_slcr
+      - const: cfg
 
   interrupts:
     maxItems: 1
@@ -86,9 +86,9 @@ examples:
                        ranges = <0x02000000 0x0 0xe0000000 0x0 0xe0000000 0x0 0x10000000>,
                                 <0x43000000 0x80 0x00000000 0x80 0x00000000 0x0 0x80000000>;
                        msi-map = <0x0 &its_gic 0x0 0x10000>;
-                       reg = <0x6 0x00000000 0x0 0x10000000>,
-                             <0x0 0xfca10000 0x0 0x1000>;
-                       reg-names = "cfg", "cpm_slcr";
+                       reg = <0x0 0xfca10000 0x0 0x1000>,
+                             <0x6 0x00000000 0x0 0x10000000>;
+                       reg-names = "cpm_slcr", "cfg";
                        pcie_intc_0: interrupt-controller {
                                #address-cells = <0>;
                                #interrupt-cells = <1>;
-- 
2.17.1

Re: [PATCH v1 3/3] dt-bindings: PCI: xilinx-cpm: Change reg property order

[Michal Simek]

On 4/14/22 11:22, Bharat Kumar Gogada wrote:
> Describe cpm reg property name before cfg reg property to align with
> node name.
> 
> Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
> ---
>   .../devicetree/bindings/pci/xilinx-versal-cpm.yaml     | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> index 4ebcc838a1f6..a3bc6ed9cf95 100644
> --- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> +++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
> @@ -18,13 +18,13 @@ properties:
>   
>     reg:
>       items:
> -      - description: Configuration space region and bridge registers.
>         - description: CPM system level control and status registers.
> +      - description: Configuration space region and bridge registers.
>   
>     reg-names:
>       items:
> -      - const: cfg
>         - const: cpm_slcr
> +      - const: cfg
>   
>     interrupts:
>       maxItems: 1
> @@ -86,9 +86,9 @@ examples:
>                          ranges = <0x02000000 0x0 0xe0000000 0x0 0xe0000000 0x0 0x10000000>,
>                                   <0x43000000 0x80 0x00000000 0x80 0x00000000 0x0 0x80000000>;
>                          msi-map = <0x0 &its_gic 0x0 0x10000>;
> -                       reg = <0x6 0x00000000 0x0 0x10000000>,
> -                             <0x0 0xfca10000 0x0 0x1000>;
> -                       reg-names = "cfg", "cpm_slcr";
> +                       reg = <0x0 0xfca10000 0x0 0x1000>,
> +                             <0x6 0x00000000 0x0 0x10000000>;
> +                       reg-names = "cpm_slcr", "cfg";
>                          pcie_intc_0: interrupt-controller {
>                                  #address-cells = <0>;
>                                  #interrupt-cells = <1>;


Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal