[2/4] doc/layerscape-pci: removed unsuitable compatible string

Message ID 20181008031428.25293-3-Zhiqiang.Hou@nxp.com
State Superseded
Delegated to: Lorenzo Pieralisi
Headers show
Series
  • dts/layerscape-pci: removed unsuitable compatible string
Related show

Commit Message

Z.q. Hou Oct. 8, 2018, 3:14 a.m.
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Removed the compatible string "snps,dw-pcie", it is for the reference
platform driver for PCI RC IP Protoyping Kits based on the ARC SDP,
so it is not suitable for all platform with designware PCIe controller,
and platform vendors have themselves' drivers.

The compatible string "snsp,dw-pcie" was added by mistake and it's not
matched that time, but it is matched because pcie drivers has been
collected recently.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 Documentation/devicetree/bindings/pci/layerscape-pci.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Rob Herring Oct. 17, 2018, 1:53 p.m. | #1
On Mon, Oct 08, 2018 at 11:14:26AM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Similar comments on this one too.

> 
> Removed the compatible string "snps,dw-pcie", it is for the reference
> platform driver for PCI RC IP Protoyping Kits based on the ARC SDP,
> so it is not suitable for all platform with designware PCIe controller,
> and platform vendors have themselves' drivers.
> 
> The compatible string "snsp,dw-pcie" was added by mistake and it's not
> matched that time, but it is matched because pcie drivers has been
> collected recently.
> 
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  Documentation/devicetree/bindings/pci/layerscape-pci.txt | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> index 5eb1c202932f..9b2b8d66d1f4 100644
> --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> @@ -13,8 +13,8 @@ information.
>  
>  Required properties:
>  - compatible: should contain the platform identifier such as:
> -        "fsl,ls1021a-pcie", "snps,dw-pcie"
> -        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
> +        "fsl,ls1021a-pcie"
> +        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"
>          "fsl,ls2088a-pcie"
>          "fsl,ls1088a-pcie"
>          "fsl,ls1046a-pcie"
> @@ -36,7 +36,7 @@ Required properties:
>  Example:
>  
>  	pcie@3400000 {
> -		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
> +		compatible = "fsl,ls1021a-pcie";
>  		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers */
>  		       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
>  		reg-names = "regs", "config";
> -- 
> 2.17.1
>
Z.q. Hou Oct. 25, 2018, 9:28 a.m. | #2
Thanks Rob!

> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: 2018年10月17日 21:53
> To: Z.q. Hou <zhiqiang.hou@nxp.com>
> Cc: linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org;
> linux-pci@vger.kernel.org; devicetree@vger.kernel.org; Leo Li
> <leoyang.li@nxp.com>; shawnguo@kernel.org; mark.rutland@arm.com;
> bhelgaas@google.com; Mingkai Hu <mingkai.hu@nxp.com>; M.h. Lian
> <minghuan.lian@nxp.com>
> Subject: Re: [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible
> string
> 
> On Mon, Oct 08, 2018 at 11:14:26AM +0800, Zhiqiang Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> Similar comments on this one too.
> 
> >
> > Removed the compatible string "snps,dw-pcie", it is for the reference
> > platform driver for PCI RC IP Protoyping Kits based on the ARC SDP, so
> > it is not suitable for all platform with designware PCIe controller,
> > and platform vendors have themselves' drivers.
> >
> > The compatible string "snsp,dw-pcie" was added by mistake and it's not
> > matched that time, but it is matched because pcie drivers has been
> > collected recently.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  Documentation/devicetree/bindings/pci/layerscape-pci.txt | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > index 5eb1c202932f..9b2b8d66d1f4 100644
> > --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > @@ -13,8 +13,8 @@ information.
> >
> >  Required properties:
> >  - compatible: should contain the platform identifier such as:
> > -        "fsl,ls1021a-pcie", "snps,dw-pcie"
> > -        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
> > +        "fsl,ls1021a-pcie"
> > +        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"
> >          "fsl,ls2088a-pcie"
> >          "fsl,ls1088a-pcie"
> >          "fsl,ls1046a-pcie"
> > @@ -36,7 +36,7 @@ Required properties:
> >  Example:
> >
> >  	pcie@3400000 {
> > -		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
> > +		compatible = "fsl,ls1021a-pcie";
> >  		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers
> */
> >  		       0x40 0x00000000 0x0 0x00002000>; /* configuration space
> */
> >  		reg-names = "regs", "config";
> > --
> > 2.17.1
> >
Lorenzo Pieralisi Nov. 22, 2018, 11:28 a.m. | #3
On Mon, Oct 08, 2018 at 11:14:26AM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> Removed the compatible string "snps,dw-pcie", it is for the reference
> platform driver for PCI RC IP Protoyping Kits based on the ARC SDP,
> so it is not suitable for all platform with designware PCIe controller,
> and platform vendors have themselves' drivers.
> 
> The compatible string "snsp,dw-pcie" was added by mistake and it's not
> matched that time, but it is matched because pcie drivers has been
> collected recently.

I do not understand what you mean, please explain it to me and I will
update the commit log accordingly before merging it.

Lorenzo

> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  Documentation/devicetree/bindings/pci/layerscape-pci.txt | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> index 5eb1c202932f..9b2b8d66d1f4 100644
> --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> @@ -13,8 +13,8 @@ information.
>  
>  Required properties:
>  - compatible: should contain the platform identifier such as:
> -        "fsl,ls1021a-pcie", "snps,dw-pcie"
> -        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
> +        "fsl,ls1021a-pcie"
> +        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"
>          "fsl,ls2088a-pcie"
>          "fsl,ls1088a-pcie"
>          "fsl,ls1046a-pcie"
> @@ -36,7 +36,7 @@ Required properties:
>  Example:
>  
>  	pcie@3400000 {
> -		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
> +		compatible = "fsl,ls1021a-pcie";
>  		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers */
>  		       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
>  		reg-names = "regs", "config";
> -- 
> 2.17.1
>
Z.q. Hou Nov. 23, 2018, 6:22 a.m. | #4
Hi Lorenzo,

Thanks a lot for your comments!

> -----Original Message-----
> From: Lorenzo Pieralisi [mailto:lorenzo.pieralisi@arm.com]
> Sent: 2018年11月22日 19:28
> To: Z.q. Hou <zhiqiang.hou@nxp.com>
> Cc: linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org;
> linux-pci@vger.kernel.org; devicetree@vger.kernel.org; robh+dt@kernel.org;
> Leo Li <leoyang.li@nxp.com>; shawnguo@kernel.org;
> mark.rutland@arm.com; bhelgaas@google.com; Mingkai Hu
> <mingkai.hu@nxp.com>; M.h. Lian <minghuan.lian@nxp.com>
> Subject: Re: [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible
> string
> 
> On Mon, Oct 08, 2018 at 11:14:26AM +0800, Zhiqiang Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > Removed the compatible string "snps,dw-pcie", it is for the reference
> > platform driver for PCI RC IP Protoyping Kits based on the ARC SDP, so
> > it is not suitable for all platform with designware PCIe controller,
> > and platform vendors have themselves' drivers.
> >
> > The compatible string "snsp,dw-pcie" was added by mistake and it's not
> > matched that time, but it is matched because pcie drivers has been
> > collected recently.
> 
> I do not understand what you mean, please explain it to me and I will update
> the commit log accordingly before merging it.

Before moving PCIe controller drivers to directory drivers/pci/controllers/, pci-layerscape.c can be matched correctly, but after that the pcie-designware-plat.c is matched instead of the pci-layerscape.c. So this patch is to avoid matching pcie-designware-plat.c by removing the "snps,dw-pcie".

Thanks,
Zhiqiang

> Lorenzo
> 
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  Documentation/devicetree/bindings/pci/layerscape-pci.txt | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > index 5eb1c202932f..9b2b8d66d1f4 100644
> > --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > @@ -13,8 +13,8 @@ information.
> >
> >  Required properties:
> >  - compatible: should contain the platform identifier such as:
> > -        "fsl,ls1021a-pcie", "snps,dw-pcie"
> > -        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
> > +        "fsl,ls1021a-pcie"
> > +        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"
> >          "fsl,ls2088a-pcie"
> >          "fsl,ls1088a-pcie"
> >          "fsl,ls1046a-pcie"
> > @@ -36,7 +36,7 @@ Required properties:
> >  Example:
> >
> >  	pcie@3400000 {
> > -		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
> > +		compatible = "fsl,ls1021a-pcie";
> >  		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers
> */
> >  		       0x40 0x00000000 0x0 0x00002000>; /* configuration space
> */
> >  		reg-names = "regs", "config";
> > --
> > 2.17.1
> >

Patch

diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
index 5eb1c202932f..9b2b8d66d1f4 100644
--- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@ -13,8 +13,8 @@  information.
 
 Required properties:
 - compatible: should contain the platform identifier such as:
-        "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
+        "fsl,ls1021a-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"
         "fsl,ls2088a-pcie"
         "fsl,ls1088a-pcie"
         "fsl,ls1046a-pcie"
@@ -36,7 +36,7 @@  Required properties:
 Example:
 
 	pcie@3400000 {
-		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
+		compatible = "fsl,ls1021a-pcie";
 		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers */
 		       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
 		reg-names = "regs", "config";