Skip to contentSkip to conversation

dts/ls2080a: Update PCIe compatible

PATCH Superseded Mingkai Hu 4 participants 7 messages Dec 4, 2015 – Jan 18, 2016

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Mingkai Hu

author
#0 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property.

---
v2 change:
- Rebased to latest kernel base

 Documentation/devicetree/bindings/pci/layerscape-pci.txt |  1 +
 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi           | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -0
index e376785..4600007 100644
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
         "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2085a-pcie", "snps,dw-pcie"
 - reg: base addresses and lengths of the PCIe controller
 - interrupts: A list of interrupt outputs of the controller. Must contain an
   entry for each entry in the interrupt-names property.
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +8 -4
index e81cd48..3821bb1 100644
@@ -383,7 +383,8 @@
 		};
 
 		pcie at 3400000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 			       0x10 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -406,7 +407,8 @@
 		};
 
 		pcie at 3500000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
 			       0x12 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -429,7 +431,8 @@
 		};
 
 		pcie at 3600000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
 			       0x14 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -452,7 +455,8 @@
 		};
 
 		pcie at 3700000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03700000 0x0 0x00100000   /* controller registers */
 			       0x16 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
Signature · 1 line
2.1.0.27.g96db324
maintainer
#1 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

Quoted 10 lines · Mingkai Hu

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property.

---
v2 change:
- Rebased to latest kernel base

How about implementing my comments on v1, too?

Quoted 69 lines
 Documentation/devicetree/bindings/pci/layerscape-pci.txt |  1 +
 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi           | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -0
index e376785..4600007 100644
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
         "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2085a-pcie", "snps,dw-pcie"
 - reg: base addresses and lengths of the PCIe controller
 - interrupts: A list of interrupt outputs of the controller. Must contain an
   entry for each entry in the interrupt-names property.
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +8 -4
index e81cd48..3821bb1 100644
@@ -383,7 +383,8 @@
 		};
 
 		pcie at 3400000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 			       0x10 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -406,7 +407,8 @@
 		};
 
 		pcie at 3500000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
 			       0x12 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -429,7 +431,8 @@
 		};
 
 		pcie at 3600000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
 			       0x14 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
@@ -452,7 +455,8 @@
 		};
 
 		pcie at 3700000 {
-			compatible = "fsl,ls2080a-pcie", "snps,dw-pcie";
+			compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
+				     "snps,dw-pcie";
 			reg = <0x00 0x03700000 0x0 0x00100000   /* controller registers */
 			       0x16 0x00000000 0x0 0x00002000>; /* configuration space */
 			reg-names = "regs", "config";
Signature · 7 lines
2.1.0.27.g96db324


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author
#2 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

Quoted 16 lines

-----Original Message-----
From: Rob Herring [mailto:robh at kernel.org]
Sent: Saturday, December 05, 2015 12:23 AM
To: Hu Mingkai-B21284
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 5 lines · Mingkai Hu

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property.

Quoted 8 lines
Quoted 5 lines

---
v2 change:
- Rebased to latest kernel base

How about implementing my comments on v1, too?

Hi Rob,

Do you mean to change the combinations in layerscape-pci.txt as follows?

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 17

Quoted 7 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

And the ls2085a was released first, but the dts file is for ls2080a (fsl-ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible string. How about your suggestion?

Thanks,
Mingkai

#3 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

Quoted 29 lines · Hu Vincent
Quoted 16 lines

-----Original Message-----
From: Rob Herring [mailto:robh at kernel.org]
Sent: Saturday, December 05, 2015 12:23 AM
To: Hu Mingkai-B21284
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 5 lines · Mingkai Hu

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property.

Quoted 8 lines
Quoted 5 lines

---
v2 change:
- Rebased to latest kernel base

How about implementing my comments on v1, too?

Hi Rob,

Do you mean to change the combinations in layerscape-pci.txt as follows?

Quoted 11 lines

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 17

Quoted 7 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

And the ls2085a was released first, but the dts file is for ls2080a (fsl-ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible string. How about your suggestion?

I think this is what Rob suggested in v1 to make the combination in document align with real dts. And it would be good to also have an entry for ls2085: "fsl,ls2085a-pcie", "snps,dw-pcie". Can you send an updated version?

Regards,
Leo

author
#4 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

In reply to Rob Herring
Quoted 39 lines

-----Original Message-----
From: Hu Mingkai-B21284
Sent: Monday, December 07, 2015 4:44 PM
To: 'Rob Herring'
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: RE: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 14 lines

-----Original Message-----
From: Rob Herring [mailto:robh at kernel.org]
Sent: Saturday, December 05, 2015 12:23 AM
To: Hu Mingkai-B21284
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 5 lines · Mingkai Hu

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property.

Quoted 8 lines
Quoted 5 lines

---
v2 change:
- Rebased to latest kernel base

How about implementing my comments on v1, too?

Hi Rob,

Do you mean to change the combinations in layerscape-pci.txt as follows?

Quoted 13 lines

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 17

Quoted 7 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

And the ls2085a was released first, but the dts file is for ls2080a (fsl- ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible string. How about your suggestion?

Hi Rob,

I will keep the "fsl,ls2085a-pcie" as the first compatible string as discussed. And change the layerscape-pci.txt as follows:

Quoted 2 lines

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 18

Quoted 2 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

What's your suggestion?

Thanks,
Mingkai

#5 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

Quoted 52 lines · On Mon, 2015-12-14 at 20:01 -0600, Hu Mingkai-B21284 wrote:
Quoted 38 lines

-----Original Message-----
From: Hu Mingkai-B21284
Sent: Monday, December 07, 2015 4:44 PM
To: 'Rob Herring'
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: RE: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 14 lines

-----Original Message-----
From: Rob Herring [mailto:robh at kernel.org]
Sent: Saturday, December 05, 2015 12:23 AM
To: Hu Mingkai-B21284
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 5 lines · Mingkai Hu

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property.

Quoted 8 lines
Quoted 5 lines

---
v2 change:
- Rebased to latest kernel base

How about implementing my comments on v1, too?

Hi Rob,

Do you mean to change the combinations in layerscape-pci.txt as follows?

Quoted 13 lines

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 17

Quoted 7 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

And the ls2085a was released first, but the dts file is for ls2080a (fsl- ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible string. How about your suggestion?

Quoted 4 lines

Hi Rob,

I will keep the "fsl,ls2085a-pcie" as the first compatible string as discussed.

Do you mean "fsl,ls2080a-pcie"?

-Scott

Quoted 6 lines

And change the layerscape-pci.txt as follows:

Quoted 2 lines

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 18

Quoted 2 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

What's your suggestion?

author
#6 lore raw

PATCH v2 1/1 dts/ls2080a: Update PCIe compatible

Quoted 66 lines

-----Original Message-----
From: Wood Scott-B07421
Sent: Tuesday, December 15, 2015 10:03 AM
To: Hu Mingkai-B21284; Rob Herring
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 20 lines · On Mon, 2015-12-14 at 20:01 -0600, Hu Mingkai-B21284 wrote:
Quoted 20 lines

-----Original Message-----
From: Hu Mingkai-B21284
Sent: Monday, December 07, 2015 4:44 PM
To: 'Rob Herring'
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: RE: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 9 lines

-----Original Message-----
From: Rob Herring [mailto:robh at kernel.org]
Sent: Saturday, December 05, 2015 12:23 AM
To: Hu Mingkai-B21284
Cc: arm at kernel.org; devicetree at vger.kernel.org; Li Yang-Leo-R58472; linux-arm-kernel at lists.infradead.org; Lian Minghuan-B31939
Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines · Mingkai Hu
Quoted 4 lines

From: Minghuan Lian <[email protected]>

The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible

property.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines

---
v2 change:
- Rebased to latest kernel base

Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

How about implementing my comments on v1, too?

Hi Rob,

Do you mean to change the combinations in layerscape-pci.txt as

follows?

Quoted 15 lines
Quoted 14 lines

Documentation/devicetree/bindings/pci/layerscape-pci.txt Required properties: · line 17

Quoted 8 lines
Documentation/devicetree/bindings/pci/layerscape-pci.txt +1 -1
@@ -15,6 +15,7 @@ Required properties:
 - compatible: should contain the platform identifier such as:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "snps,dw-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"

And the ls2085a was released first, but the dts file is for ls2080a (fsl- ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible string. How about your suggestion?

Quoted 7 lines
Quoted 4 lines

Hi Rob,

I will keep the "fsl,ls2085a-pcie" as the first compatible string as discussed.

Do you mean "fsl,ls2080a-pcie"?

Oops. Yes, it's "fsl,ls2080a-pcie ".

Thanks,
Mingkai