Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76fb6570 authored by Daniel Drake's avatar Daniel Drake Committed by H. Peter Anvin
Browse files

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: default avatarDaniel 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: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent b30a3f62

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT 
	bool "Direct"



config PCI_GOOLPC

	bool "OLPC"

	bool "OLPC XO-1"

	depends on OLPC



config PCI_GOANY

arch/x86/kernel/olpc.c

+4 −2
Original line number Diff line number Diff line
@@ -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

arch/x86/pci/olpc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;