linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string
@ 2018-10-08  3:14 Zhiqiang Hou
  2018-10-08  3:14 ` [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings Zhiqiang Hou
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Zhiqiang Hou @ 2018-10-08  3:14 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian
  Cc: Hou Zhiqiang

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Removed the compatible string "snps,dw-pcie" from FSL layerscape-pci compatible
string list.

Hou Zhiqiang (4):
  doc/layerscape-pci: update the PCIe compatible strings
  doc/layerscape-pci: removed unsuitable compatible string
  dts/arm/ls1021a: Clean PCIe controller compatible strings
  dts/arm64/layerscape: Clean PCIe controller compatible strings

 .../devicetree/bindings/pci/layerscape-pci.txt       |  7 ++++---
 arch/arm/boot/dts/ls1021a.dtsi                       |  4 ++--
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi       |  2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi       |  6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi       |  6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi       |  6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi       |  8 ++++----
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi       | 12 ++++--------
 8 files changed, 24 insertions(+), 27 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings
  2018-10-08  3:14 [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
@ 2018-10-08  3:14 ` Zhiqiang Hou
  2018-10-17 13:51   ` Rob Herring
  2018-10-08  3:14 ` [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Zhiqiang Hou @ 2018-10-08  3:14 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian
  Cc: Hou Zhiqiang

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

The pcie compatible string for LS1043A was lost, so add it.

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

diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
index 66df1e81e0b8..5eb1c202932f 100644
--- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@ -18,6 +18,7 @@ Required properties:
         "fsl,ls2088a-pcie"
         "fsl,ls1088a-pcie"
         "fsl,ls1046a-pcie"
+        "fsl,ls1043a-pcie"
         "fsl,ls1012a-pcie"
 - reg: base addresses and lengths of the PCIe controller register blocks.
 - interrupts: A list of interrupt outputs of the controller. Must contain an
-- 
2.17.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string
  2018-10-08  3:14 [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
  2018-10-08  3:14 ` [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings Zhiqiang Hou
@ 2018-10-08  3:14 ` Zhiqiang Hou
  2018-10-17 13:53   ` Rob Herring
  2018-11-22 11:28   ` Lorenzo Pieralisi
  2018-10-08  3:14 ` [PATCH 3/4] dts/arm/ls1021a: Clean PCIe controller compatible strings Zhiqiang Hou
                   ` (2 subsequent siblings)
  4 siblings, 2 replies; 13+ messages in thread
From: Zhiqiang Hou @ 2018-10-08  3:14 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian
  Cc: Hou Zhiqiang

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(-)

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


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 3/4] dts/arm/ls1021a: Clean PCIe controller compatible strings
  2018-10-08  3:14 [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
  2018-10-08  3:14 ` [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings Zhiqiang Hou
  2018-10-08  3:14 ` [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
@ 2018-10-08  3:14 ` Zhiqiang Hou
  2018-10-08  3:14 ` [PATCH 4/4] dts/arm64/layerscape: " Zhiqiang Hou
  2018-11-20 12:53 ` [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Lorenzo Pieralisi
  4 siblings, 0 replies; 13+ messages in thread
From: Zhiqiang Hou @ 2018-10-08  3:14 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian
  Cc: Hou Zhiqiang

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Removed the wrong compatible string "snps,dw-pcie", in case
match incorrect driver.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 arch/arm/boot/dts/ls1021a.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index f70025c2ab0f..13e91d577a26 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -716,7 +716,7 @@
 		};
 
 		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";
@@ -739,7 +739,7 @@
 		};
 
 		pcie@3500000 {
-			compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1021a-pcie";
 			reg = <0x00 0x03500000 0x0 0x00010000   /* controller registers */
 			       0x48 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
-- 
2.17.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 4/4] dts/arm64/layerscape: Clean PCIe controller compatible strings
  2018-10-08  3:14 [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
                   ` (2 preceding siblings ...)
  2018-10-08  3:14 ` [PATCH 3/4] dts/arm/ls1021a: Clean PCIe controller compatible strings Zhiqiang Hou
@ 2018-10-08  3:14 ` Zhiqiang Hou
  2018-11-20 12:53 ` [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Lorenzo Pieralisi
  4 siblings, 0 replies; 13+ messages in thread
From: Zhiqiang Hou @ 2018-10-08  3:14 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian
  Cc: Hou Zhiqiang

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Removed the wrong compatible string "snps,dw-pcie", in case
match incorrect driver.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi |  2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi |  6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi |  6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi |  6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi |  8 ++++----
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 12 ++++--------
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 68ac78c4564d..d3fe0771d3a0 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -475,7 +475,7 @@
 		};
 
 		pcie@3400000 {
-			compatible = "fsl,ls1012a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1012a-pcie";
 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 			       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 6cc4c87614b6..1b61782df73e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -661,7 +661,7 @@
 		};
 
 		pcie@3400000 {
-			compatible = "fsl,ls1043a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1043a-pcie";
 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 			       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -686,7 +686,7 @@
 		};
 
 		pcie@3500000 {
-			compatible = "fsl,ls1043a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1043a-pcie";
 			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
 			       0x48 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -711,7 +711,7 @@
 		};
 
 		pcie@3600000 {
-			compatible = "fsl,ls1043a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1043a-pcie";
 			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
 			       0x50 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 3a2a14a8e187..71585aefe1ef 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -630,7 +630,7 @@
 		};
 
 		pcie@3400000 {
-			compatible = "fsl,ls1046a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1046a-pcie";
 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 			       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -655,7 +655,7 @@
 		};
 
 		pcie@3500000 {
-			compatible = "fsl,ls1046a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1046a-pcie";
 			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
 			       0x48 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -680,7 +680,7 @@
 		};
 
 		pcie@3600000 {
-			compatible = "fsl,ls1046a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1046a-pcie";
 			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
 			       0x50 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index a07f612ab56b..10b253c88a16 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -512,7 +512,7 @@
 		};
 
 		pcie@3400000 {
-			compatible = "fsl,ls1088a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1088a-pcie";
 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 			       0x20 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -536,7 +536,7 @@
 		};
 
 		pcie@3500000 {
-			compatible = "fsl,ls1088a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1088a-pcie";
 			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
 			       0x28 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -560,7 +560,7 @@
 		};
 
 		pcie@3600000 {
-			compatible = "fsl,ls1088a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls1088a-pcie";
 			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
 			       0x30 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
index 7c882da3f6b0..a5f668d786b8 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
@@ -119,7 +119,7 @@
 };
 
 &pcie1 {
-	compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
+	compatible = "fsl,ls2088a-pcie";
 	reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 	       0x20 0x00000000 0x0 0x00002000>; /* configuration space */
 
@@ -128,7 +128,7 @@
 };
 
 &pcie2 {
-	compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
+	compatible = "fsl,ls2088a-pcie";
 	reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
 	       0x28 0x00000000 0x0 0x00002000>; /* configuration space */
 
@@ -137,7 +137,7 @@
 };
 
 &pcie3 {
-	compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
+	compatible = "fsl,ls2088a-pcie";
 	reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
 	       0x30 0x00000000 0x0 0x00002000>; /* configuration space */
 
@@ -146,7 +146,7 @@
 };
 
 &pcie4 {
-	compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
+	compatible = "fsl,ls2088a-pcie";
 	reg = <0x00 0x03700000 0x0 0x00100000   /* controller registers */
 	       0x38 0x00000000 0x0 0x00002000>; /* configuration space */
 
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index 547a86ec7cd2..d5dd4e7f1099 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -625,8 +625,7 @@
 		};
 
 		pcie1: pcie@3400000 {
-			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
-				     "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie";
 			reg-names = "regs", "config";
 			interrupts = <0 108 0x4>; /* Level high type */
 			interrupt-names = "intr";
@@ -646,8 +645,7 @@
 		};
 
 		pcie2: pcie@3500000 {
-			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
-				     "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie";
 			reg-names = "regs", "config";
 			interrupts = <0 113 0x4>; /* Level high type */
 			interrupt-names = "intr";
@@ -667,8 +665,7 @@
 		};
 
 		pcie3: pcie@3600000 {
-			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
-				     "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie";
 			reg-names = "regs", "config";
 			interrupts = <0 118 0x4>; /* Level high type */
 			interrupt-names = "intr";
@@ -688,8 +685,7 @@
 		};
 
 		pcie4: pcie@3700000 {
-			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
-				     "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie";
 			reg-names = "regs", "config";
 			interrupts = <0 123 0x4>; /* Level high type */
 			interrupt-names = "intr";
-- 
2.17.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings
  2018-10-08  3:14 ` [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings Zhiqiang Hou
@ 2018-10-17 13:51   ` Rob Herring
  2018-10-25  9:27     ` Z.q. Hou
  0 siblings, 1 reply; 13+ messages in thread
From: Rob Herring @ 2018-10-17 13:51 UTC (permalink / raw)
  To: Zhiqiang Hou
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian

On Mon, Oct 08, 2018 at 11:14:25AM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> The pcie compatible string for LS1043A was lost, so add it.

PCIe

The subject could be improved to say exactly what compatible string you 
are adding. And the subject should start with "dt-bindings: pci: ..."

> 
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> index 66df1e81e0b8..5eb1c202932f 100644
> --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> @@ -18,6 +18,7 @@ Required properties:
>          "fsl,ls2088a-pcie"
>          "fsl,ls1088a-pcie"
>          "fsl,ls1046a-pcie"
> +        "fsl,ls1043a-pcie"
>          "fsl,ls1012a-pcie"
>  - reg: base addresses and lengths of the PCIe controller register blocks.
>  - interrupts: A list of interrupt outputs of the controller. Must contain an
> -- 
> 2.17.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string
  2018-10-08  3:14 ` [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
@ 2018-10-17 13:53   ` Rob Herring
  2018-10-25  9:28     ` Z.q. Hou
  2018-11-22 11:28   ` Lorenzo Pieralisi
  1 sibling, 1 reply; 13+ messages in thread
From: Rob Herring @ 2018-10-17 13:53 UTC (permalink / raw)
  To: Zhiqiang Hou
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian

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
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* RE: [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings
  2018-10-17 13:51   ` Rob Herring
@ 2018-10-25  9:27     ` Z.q. Hou
  0 siblings, 0 replies; 13+ messages in thread
From: Z.q. Hou @ 2018-10-25  9:27 UTC (permalink / raw)
  To: Rob Herring
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree, Leo Li,
	shawnguo, mark.rutland, bhelgaas, Mingkai Hu, M.h. Lian

Hi Rob,

Thanks a lot for your comments!
 
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: 2018年10月17日 21:52
> 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 1/4] doc/layerscape-pci: update the PCIe compatible
> strings
> 
> On Mon, Oct 08, 2018 at 11:14:25AM +0800, Zhiqiang Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > The pcie compatible string for LS1043A was lost, so add it.
> 
> PCIe
> 
> The subject could be improved to say exactly what compatible string you are
> adding. And the subject should start with "dt-bindings: pci: ..."
>

Yes, will correct them in v2.
 
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > index 66df1e81e0b8..5eb1c202932f 100644
> > --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
> > @@ -18,6 +18,7 @@ Required properties:
> >          "fsl,ls2088a-pcie"
> >          "fsl,ls1088a-pcie"
> >          "fsl,ls1046a-pcie"
> > +        "fsl,ls1043a-pcie"
> >          "fsl,ls1012a-pcie"
> >  - reg: base addresses and lengths of the PCIe controller register blocks.
> >  - interrupts: A list of interrupt outputs of the controller. Must
> > contain an
> > --
> > 2.17.1
> >

^ permalink raw reply	[flat|nested] 13+ messages in thread

* RE: [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string
  2018-10-17 13:53   ` Rob Herring
@ 2018-10-25  9:28     ` Z.q. Hou
  0 siblings, 0 replies; 13+ messages in thread
From: Z.q. Hou @ 2018-10-25  9:28 UTC (permalink / raw)
  To: Rob Herring
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree, Leo Li,
	shawnguo, mark.rutland, bhelgaas, Mingkai Hu, M.h. Lian


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
> >

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string
  2018-10-08  3:14 [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
                   ` (3 preceding siblings ...)
  2018-10-08  3:14 ` [PATCH 4/4] dts/arm64/layerscape: " Zhiqiang Hou
@ 2018-11-20 12:53 ` Lorenzo Pieralisi
  2018-11-23  7:36   ` Shawn Guo
  4 siblings, 1 reply; 13+ messages in thread
From: Lorenzo Pieralisi @ 2018-11-20 12:53 UTC (permalink / raw)
  To: Zhiqiang Hou, robh+dt
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian

On Mon, Oct 08, 2018 at 11:14:24AM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> Removed the compatible string "snps,dw-pcie" from FSL layerscape-pci compatible
> string list.
> 
> Hou Zhiqiang (4):
>   doc/layerscape-pci: update the PCIe compatible strings
>   doc/layerscape-pci: removed unsuitable compatible string
>   dts/arm/ls1021a: Clean PCIe controller compatible strings
>   dts/arm64/layerscape: Clean PCIe controller compatible strings
> 
>  .../devicetree/bindings/pci/layerscape-pci.txt       |  7 ++++---
>  arch/arm/boot/dts/ls1021a.dtsi                       |  4 ++--
>  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi       |  2 +-
>  arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi       |  6 +++---
>  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi       |  6 +++---
>  arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi       |  6 +++---
>  arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi       |  8 ++++----
>  arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi       | 12 ++++--------
>  8 files changed, 24 insertions(+), 27 deletions(-)

Hi Rob,

I assume the dts changes in this series are OK so I am going to
pull them in the PCI tree, please let me know if you see any
problem with that.

Thanks,
Lorenzo

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string
  2018-10-08  3:14 ` [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
  2018-10-17 13:53   ` Rob Herring
@ 2018-11-22 11:28   ` Lorenzo Pieralisi
  2018-11-23  6:22     ` Z.q. Hou
  1 sibling, 1 reply; 13+ messages in thread
From: Lorenzo Pieralisi @ 2018-11-22 11:28 UTC (permalink / raw)
  To: Zhiqiang Hou
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	leoyang.li, shawnguo, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian

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
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* RE: [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string
  2018-11-22 11:28   ` Lorenzo Pieralisi
@ 2018-11-23  6:22     ` Z.q. Hou
  0 siblings, 0 replies; 13+ messages in thread
From: Z.q. Hou @ 2018-11-23  6:22 UTC (permalink / raw)
  To: Lorenzo Pieralisi
  Cc: linux-arm-kernel, linux-kernel, linux-pci, devicetree, robh+dt,
	Leo Li, shawnguo, mark.rutland, bhelgaas, Mingkai Hu, M.h. Lian

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
> >

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string
  2018-11-20 12:53 ` [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Lorenzo Pieralisi
@ 2018-11-23  7:36   ` Shawn Guo
  0 siblings, 0 replies; 13+ messages in thread
From: Shawn Guo @ 2018-11-23  7:36 UTC (permalink / raw)
  To: Lorenzo Pieralisi
  Cc: Zhiqiang Hou, robh+dt, linux-arm-kernel, linux-kernel, linux-pci,
	devicetree, leoyang.li, mark.rutland, bhelgaas, Mingkai.Hu,
	Minghuan.Lian

On Tue, Nov 20, 2018 at 12:53:14PM +0000, Lorenzo Pieralisi wrote:
> On Mon, Oct 08, 2018 at 11:14:24AM +0800, Zhiqiang Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > 
> > Removed the compatible string "snps,dw-pcie" from FSL layerscape-pci compatible
> > string list.
> > 
> > Hou Zhiqiang (4):
> >   doc/layerscape-pci: update the PCIe compatible strings
> >   doc/layerscape-pci: removed unsuitable compatible string
> >   dts/arm/ls1021a: Clean PCIe controller compatible strings
> >   dts/arm64/layerscape: Clean PCIe controller compatible strings
> > 
> >  .../devicetree/bindings/pci/layerscape-pci.txt       |  7 ++++---
> >  arch/arm/boot/dts/ls1021a.dtsi                       |  4 ++--
> >  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi       |  2 +-
> >  arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi       |  6 +++---
> >  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi       |  6 +++---
> >  arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi       |  6 +++---
> >  arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi       |  8 ++++----
> >  arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi       | 12 ++++--------
> >  8 files changed, 24 insertions(+), 27 deletions(-)
> 
> Hi Rob,
> 
> I assume the dts changes in this series are OK so I am going to
> pull them in the PCI tree, please let me know if you see any
> problem with that.

I will take the dts changes.

Shawn

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2018-11-23  7:36 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-08  3:14 [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
2018-10-08  3:14 ` [PATCH 1/4] doc/layerscape-pci: update the PCIe compatible strings Zhiqiang Hou
2018-10-17 13:51   ` Rob Herring
2018-10-25  9:27     ` Z.q. Hou
2018-10-08  3:14 ` [PATCH 2/4] doc/layerscape-pci: removed unsuitable compatible string Zhiqiang Hou
2018-10-17 13:53   ` Rob Herring
2018-10-25  9:28     ` Z.q. Hou
2018-11-22 11:28   ` Lorenzo Pieralisi
2018-11-23  6:22     ` Z.q. Hou
2018-10-08  3:14 ` [PATCH 3/4] dts/arm/ls1021a: Clean PCIe controller compatible strings Zhiqiang Hou
2018-10-08  3:14 ` [PATCH 4/4] dts/arm64/layerscape: " Zhiqiang Hou
2018-11-20 12:53 ` [PATCH 0/4] dts/layerscape-pci: removed unsuitable compatible string Lorenzo Pieralisi
2018-11-23  7:36   ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).