From 9f5de8ec2dbd9cbb9998b73037e964db166ee4df Mon Sep 17 00:00:00 2001
From: Roy Zang <tie-fei.zang@freescale.com>
Date: Mon, 3 Sep 2012 17:22:10 +0800
Subject: [PATCH] --- yaml --- r: 330363 b: refs/heads/master c:
 9e67886becd7fab36c97ef43bb81515c18a66be1 h: refs/heads/master i:   330361:
 89d9eff5e547c81b9156bb8d33af138c679ed928   330359:
 aca1f645116b47d5306698f7d561fa3d1b611f25 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/powerpc/sysdev/fsl_pci.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f5c5181728c4..d56ec62eb407 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cc1b4e931f8d8dccdcdb05b758a7d1178ad6b49
+refs/heads/master: 9e67886becd7fab36c97ef43bb81515c18a66be1
diff --git a/trunk/arch/powerpc/sysdev/fsl_pci.c b/trunk/arch/powerpc/sysdev/fsl_pci.c
index da7a3d7f54cc..23acaf4692dc 100644
--- a/trunk/arch/powerpc/sysdev/fsl_pci.c
+++ b/trunk/arch/powerpc/sysdev/fsl_pci.c
@@ -143,18 +143,20 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
 	pr_debug("PCI memory map start 0x%016llx, size 0x%016llx\n",
 		 (u64)rsrc->start, (u64)resource_size(rsrc));
 
-	if (of_device_is_compatible(hose->dn, "fsl,qoriq-pcie-v2.2")) {
-		win_idx = 2;
-		start_idx = 0;
-		end_idx = 3;
-	}
-
 	pci = ioremap(rsrc->start, resource_size(rsrc));
 	if (!pci) {
 	    dev_err(hose->parent, "Unable to map ATMU registers\n");
 	    return;
 	}
 
+	if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) {
+		if (in_be32(&pci->block_rev1) >= PCIE_IP_REV_2_2) {
+			win_idx = 2;
+			start_idx = 0;
+			end_idx = 3;
+		}
+	}
+
 	/* Disable all windows (except powar0 since it's ignored) */
 	for(i = 1; i < 5; i++)
 		out_be32(&pci->pow[i].powar, 0);