powerpc/85xx: fix various PCI node compatible strings

Fix and/or improve the compatible strings of the PCI device tree nodes for
some Freescale SOCs.  This fixes some issues and improves consistency among
the SOCs.

Specifically:

1) The P1022 has a v1 PCIe controller, so the compatible property should just
say "fsl,mpc8548-pcie".  U-Boot does not look for "fsl,p1022-pcie", so it
wasn't fixing up the node.

2) The P4080 has a v2.1 PCIe controller, so add that version-specific string
to the device tree.  Update the kernel to also look for that string.
Currently, the kernel looks for "fsl,p4080-pcie" specifically, but
eventually that check should be deleted.

3) The P1010 device tree claims compatibility with v2.2 and v2.3, but that's
redundant.  No other device tree does this.  Remove the v2.2 string.

4) The kernel looks for both "fsl,p1023-pcie" and "fsl,qoriq-pcie-v2.2",
even though the P1023 device trees has always included both strings.  Remove
the search for "fsl,p1023-pcie".

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
index 0bde9ee8afafc5d2137ddc571e8bc1c9de9ea206..af12ead88c5f0321739291d9730b1654f96da979 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
@@ -41,7 +41,7 @@
 
 /* controller at 0x9000 */
 &pci0 {
-       compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";
+       compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;
@@ -69,7 +69,7 @@
 
 /* controller at 0xa000 */
 &pci1 {
-       compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";
+       compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;

diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
index 06216b8c0af527ae15b6ea87ef40e748196b41e5..e179803a81ef88b6c17feeba36a157bbe3a51dbd 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
@@ -45,7 +45,7 @@
 
 /* controller at 0x9000 */
 &pci0 {
-       compatible = "fsl,p1022-pcie";
+       compatible = "fsl,mpc8548-pcie";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;
@@ -73,7 +73,7 @@
 
 /* controller at 0xa000 */
 &pci1 {
-       compatible = "fsl,p1022-pcie";
+       compatible = "fsl,mpc8548-pcie";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;
@@ -102,7 +102,7 @@
 
 /* controller at 0xb000 */
 &pci2 {
-       compatible = "fsl,p1022-pcie";
+       compatible = "fsl,mpc8548-pcie";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;

diff --git a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
index dc82bcfa2f616a9c13096153cb1ddbcad0ae46ef..19859ad851eb5223111349dd48c766cef0a9ba3a 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
@@ -41,7 +41,7 @@
 
 /* controller at 0x200000 */
 &pci0 {
-       compatible = "fsl,p4080-pcie";
+       compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;
@@ -70,7 +70,7 @@
 
 /* controller at 0x201000 */
 &pci1 {
-       compatible = "fsl,p4080-pcie";
+       compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;
@@ -99,7 +99,7 @@
 
 /* controller at 0x202000 */
 &pci2 {
-       compatible = "fsl,p4080-pcie";
+       compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";
        device_type = "pci";
        #size-cells = <2>;
        #address-cells = <3>;

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 92a5915b18276ec2cd0fc3b0d27107e770cd98a8..f213fb6dabfc7352f3ff9800b16b22f3233a2cdd 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -827,13 +827,18 @@ static const struct of_device_id pci_ids[] = {
        { .compatible = "fsl,mpc8548-pcie", },
        { .compatible = "fsl,mpc8610-pci", },
        { .compatible = "fsl,mpc8641-pcie", },
+       { .compatible = "fsl,qoriq-pcie-v2.1", },
+       { .compatible = "fsl,qoriq-pcie-v2.2", },
+       { .compatible = "fsl,qoriq-pcie-v2.3", },
+       { .compatible = "fsl,qoriq-pcie-v2.4", },
+
+       /*
+        * The following entries are for compatibility with older device
+        * trees.
+        */
        { .compatible = "fsl,p1022-pcie", },
-       { .compatible = "fsl,p1010-pcie", },
-       { .compatible = "fsl,p1023-pcie", },
        { .compatible = "fsl,p4080-pcie", },
-       { .compatible = "fsl,qoriq-pcie-v2.4", },
-       { .compatible = "fsl,qoriq-pcie-v2.3", },
-       { .compatible = "fsl,qoriq-pcie-v2.2", },
+
        {},
 };