4 files changed, 18 insertions, 13 deletions

diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
index 0bde9ee8afaf..af12ead88c5f 100644
--- 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 06216b8c0af5..e179803a81ef 100644
--- 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 dc82bcfa2f61..19859ad851eb 100644
--- 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 92a5915b1827..f213fb6dabfc 100644
--- 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", },
+
         {},
 };