From: Hou Zhiqiang <[email protected]>
Removed the compatible string "snps,dw-pcie" from FSL layerscape-pci compatible
string list.
Hou Zhiqiang (4):
dt-bindings: pci: layerscape-pci: add compatible strings
"fsl,ls1043a-pcie"
dt-bindings: pci: layerscape-pci: removed compatible string
"snps,dw-pcie"
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
From: Hou Zhiqiang <[email protected]>
The PCIe compatible string for LS1043A was lost, so add it.
Signed-off-by: Hou Zhiqiang <[email protected]>
---
V2:
- Improved the subject and corrected 'PCIe' casing.
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
From: Hou Zhiqiang <[email protected]>
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 <[email protected]>
---
V2:
- Improved the subject.
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
From: Hou Zhiqiang <[email protected]>
Removed the wrong compatible string "snps,dw-pcie", in case
match incorrect driver.
Signed-off-by: Hou Zhiqiang <[email protected]>
---
V2:
- no change
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 bdd6e66a79ad..1aaa3288a450 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
From: Hou Zhiqiang <[email protected]>
Removed the wrong compatible string "snps,dw-pcie", in case
match incorrect driver.
Signed-off-by: Hou Zhiqiang <[email protected]>
---
V2:
- no change
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 5da732f82fa0..028a6daa5597 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 3fed504b5381..5480d6c4c548 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 51cbd50012d6..519315c5d507 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 d188774a36e8..80cc40f76a4a 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -630,8 +630,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";
@@ -651,8 +650,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";
@@ -672,8 +670,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";
@@ -693,8 +690,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
On Thu, 25 Oct 2018 09:49:34 +0000, "Z.q. Hou" wrote:
> From: Hou Zhiqiang <[email protected]>
>
> The PCIe compatible string for LS1043A was lost, so add it.
>
> Signed-off-by: Hou Zhiqiang <[email protected]>
> ---
> V2:
> - Improved the subject and corrected 'PCIe' casing.
>
> Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 +
> 1 file changed, 1 insertion(+)
>
Reviewed-by: Rob Herring <[email protected]>
On Thu, 25 Oct 2018 09:49:39 +0000, "Z.q. Hou" wrote:
> From: Hou Zhiqiang <[email protected]>
>
> 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 <[email protected]>
> ---
> V2:
> - Improved the subject.
>
> Documentation/devicetree/bindings/pci/layerscape-pci.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Thu, Oct 25, 2018 at 4:52 AM Z.q. Hou <[email protected]> wrote:
The correct prefix for arm dts patches should be: "ARM: dts: ls1021a:
...", and it should be better to mention the string removed in the
title too.
>
> From: Hou Zhiqiang <[email protected]>
>
> Removed the wrong compatible string "snps,dw-pcie", in case
> match incorrect driver.
>
> Signed-off-by: Hou Zhiqiang <[email protected]>
> ---
> V2:
> - no change
>
> 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 bdd6e66a79ad..1aaa3288a450 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
>
On Thu, Oct 25, 2018 at 4:53 AM Z.q. Hou <[email protected]> wrote:
The correct prefix for arm64 dts patches should be: "arm64: dts:
layerscape: ...", and it should be better to mention the string
removed in the title too.
>
> From: Hou Zhiqiang <[email protected]>
>
> Removed the wrong compatible string "snps,dw-pcie", in case
> match incorrect driver.
>
> Signed-off-by: Hou Zhiqiang <[email protected]>
> ---
> V2:
> - no change
>
> 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 5da732f82fa0..028a6daa5597 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 3fed504b5381..5480d6c4c548 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 51cbd50012d6..519315c5d507 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 d188774a36e8..80cc40f76a4a 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> @@ -630,8 +630,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";
> @@ -651,8 +650,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";
> @@ -672,8 +670,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";
> @@ -693,8 +690,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
>
Hi Leo,
Thanks a lot for your comments!
> -----Original Message-----
> From: Li Yang <[email protected]>
> Sent: 2018年10月27日 4:58
> To: Z.q. Hou <[email protected]>
> Cc: moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
> <[email protected]>; lkml <[email protected]>;
> [email protected]; open list:OPEN FIRMWARE AND FLATTENED
> DEVICE TREE BINDINGS <[email protected]>; Rob Herring
> <[email protected]>; Shawn Guo <[email protected]>; Mark Rutland
> <[email protected]>; Bjorn Helgaas <[email protected]>; Mingkai
> Hu <[email protected]>; M.h. Lian <[email protected]>
> Subject: Re: [PATCH v2 3/4] dts/arm/ls1021a: Clean PCIe controller
> compatible strings
>
> On Thu, Oct 25, 2018 at 4:52 AM Z.q. Hou <[email protected]> wrote:
>
> The correct prefix for arm dts patches should be: "ARM: dts: ls1021a:
> ...", and it should be better to mention the string removed in the title too.
Will correct it in v3.
>
> >
> > From: Hou Zhiqiang <[email protected]>
> >
> > Removed the wrong compatible string "snps,dw-pcie", in case match
> > incorrect driver.
> >
> > Signed-off-by: Hou Zhiqiang <[email protected]>
> > ---
> > V2:
> > - no change
> >
> > 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 bdd6e66a79ad..1aaa3288a450
> > 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
> >
Thanks,
Zhiqiang
Hi Leo,
Thanks a lot for your comments!
> -----Original Message-----
> From: Li Yang <[email protected]>
> Sent: 2018年10月27日 5:01
> To: Z.q. Hou <[email protected]>
> Cc: moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
> <[email protected]>; lkml <[email protected]>;
> [email protected]; open list:OPEN FIRMWARE AND FLATTENED
> DEVICE TREE BINDINGS <[email protected]>; Rob Herring
> <[email protected]>; Shawn Guo <[email protected]>; Mark Rutland
> <[email protected]>; Bjorn Helgaas <[email protected]>; Mingkai
> Hu <[email protected]>; M.h. Lian <[email protected]>
> Subject: Re: [PATCH v2 4/4] dts/arm64/layerscape: Clean PCIe controller
> compatible strings
>
> On Thu, Oct 25, 2018 at 4:53 AM Z.q. Hou <[email protected]> wrote:
>
> The correct prefix for arm64 dts patches should be: "arm64: dts:
> layerscape: ...", and it should be better to mention the string removed in the
> title too.
Will fix it in v3.
>
> >
> > From: Hou Zhiqiang <[email protected]>
> >
> > Removed the wrong compatible string "snps,dw-pcie", in case match
> > incorrect driver.
> >
> > Signed-off-by: Hou Zhiqiang <[email protected]>
> > ---
> > V2:
> > - no change
> >
> > 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 5da732f82fa0..028a6daa5597 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 3fed504b5381..5480d6c4c548 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 51cbd50012d6..519315c5d507 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 d188774a36e8..80cc40f76a4a 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> > @@ -630,8 +630,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"; @@ -651,8 +650,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"; @@ -672,8 +670,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"; @@ -693,8 +690,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
> >
Thanks,
Zhiqiang