lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Daniel Drake
2010-09-23 17:28:04 +01:00
committed by H. Peter Anvin
parent b30a3f6257
commit 76fb657017
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/Kconfig
View File

@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
bool "Direct" bool "Direct"
config PCI_GOOLPC config PCI_GOOLPC
bool "OLPC" bool "OLPC XO-1"
depends on OLPC depends on OLPC
config PCI_GOANY config PCI_GOANY

6
arch/x86/kernel/olpc.c
View File

@@ -242,8 +242,10 @@ static int __init olpc_init(void)
(unsigned char *) &olpc_platform_info.ecver, 1); (unsigned char *) &olpc_platform_info.ecver, 1);
#ifdef CONFIG_PCI_OLPC #ifdef CONFIG_PCI_OLPC
/* If the VSA exists let it emulate PCI, if not emulate in kernel */ /* If the VSA exists let it emulate PCI, if not emulate in kernel.
if (!cs5535_has_vsa2()) * XO-1 only. */
if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) &&
!cs5535_has_vsa2())
x86_init.pci.arch_init = pci_olpc_init; x86_init.pci.arch_init = pci_olpc_init;
#endif #endif

2
arch/x86/pci/olpc.c
View File

@@ -304,7 +304,7 @@ static struct pci_raw_ops pci_olpc_conf = {
int __init pci_olpc_init(void) 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; raw_pci_ops = &pci_olpc_conf;
is_lx = is_geode_lx(); is_lx = is_geode_lx();
return 0; return 0;