x86, olpc: Only enable PCI configuration type override on XO-1

This configuration type override is for XO-1 only and must not happen
on XO-1.5.

Signed-off-by: Daniel Drake <dsd@laptop.org>
LKML-Reference: <20100923162805.0F6549D401B@zog.reactivated.net>
Cc: Andres Solomon <dilinger@queued.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

3 files changed, 6 insertions, 4 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cea0cd9a316f..0ed4c9bfcd13 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
         bool "Direct"
 
 config PCI_GOOLPC
-        bool "OLPC"
+        bool "OLPC XO-1"
         depends on OLPC
 
 config PCI_GOANY
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 0e0cdde519be..635888cf050d 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -242,8 +242,10 @@ static int __init olpc_init(void)
                         (unsigned char *) &olpc_platform_info.ecver, 1);
 
 #ifdef CONFIG_PCI_OLPC
-        /* If the VSA exists let it emulate PCI, if not emulate in kernel */
-        if (!cs5535_has_vsa2())
+        /* If the VSA exists let it emulate PCI, if not emulate in kernel.
+         * XO-1 only. */
+        if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) &&
+                        !cs5535_has_vsa2())
                 x86_init.pci.arch_init = pci_olpc_init;
 #endif
 
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
index b34815408f58..13700ec8e2e4 100644
--- a/arch/x86/pci/olpc.c
+++ b/arch/x86/pci/olpc.c
@@ -304,7 +304,7 @@ static struct pci_raw_ops pci_olpc_conf = {
 
 int __init pci_olpc_init(void)
 {
-        printk(KERN_INFO "PCI: Using configuration type OLPC\n");
+        printk(KERN_INFO "PCI: Using configuration type OLPC XO-1\n");
         raw_pci_ops = &pci_olpc_conf;
         is_lx = is_geode_lx();
         return 0;