Skip to contentSkip to conversation

x86/olpc for v2.6.37

GIT PULL Ingo Molnar 1 participant 1 message Oct 21, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-olpc-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-olpc-for-linus

Thanks,

Ingo

------------------>
Daniel Drake (4):
x86, olpc: Only enable PCI configuration type override on XO-1 x86, olpc: Rework BIOS signature check
x86, olpc: Add XO-1 poweroff support
x86, olpc: Register XO-1 platform devices

Paul Fox (1):
x86, olpc: Don't retry EC commands forever

Randy Dunlap (1):
x86, olpc: XO-1 uses/depends on PCI

 arch/x86/Kconfig                |   11 +++-
 arch/x86/include/asm/olpc_ofw.h |    4 +
 arch/x86/kernel/Makefile        |    1 +
 arch/x86/kernel/olpc-xo1.c      |  140 +++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/olpc.c          |   89 +++++++++++++++----------
 arch/x86/kernel/olpc_ofw.c      |    6 ++
 arch/x86/pci/olpc.c             |    2 +-
 7 files changed, 216 insertions(+), 37 deletions(-)
 create mode 100644 arch/x86/kernel/olpc-xo1.c
arch/x86/Kconfig +9 -2
index cea0cd9..c010b8d 100644
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
@@ -2061,14 +2061,21 @@ config SCx200HR_TIMER
 config OLPC
 	bool "One Laptop Per Child support"
 	select GPIOLIB
+	select OLPC_OPENFIRMWARE
 	---help---
 	  Add support for detecting the unique features of the OLPC
 	  XO hardware.
 
+config OLPC_XO1
+	tristate "OLPC XO-1 support"
+	depends on OLPC && PCI
+	---help---
+	  Add support for non-essential features of the OLPC XO-1 laptop.
+
 config OLPC_OPENFIRMWARE
 	bool "Support for OLPC's Open Firmware"
 	depends on !X86_64 && !X86_PAE
-	default y if OLPC
+	default n
 	help
 	  This option adds support for the implementation of Open Firmware
 	  that is used on the OLPC XO-1 Children's Machine.
arch/x86/include/asm/olpc_ofw.h +4 -0
index 08fde47..2a84781 100644
@@ -21,10 +21,14 @@ extern void olpc_ofw_detect(void);
 /* install OFW's pde permanently into the kernel's pgtable */
 extern void setup_olpc_ofw_pgd(void);
 
+/* check if OFW was detected during boot */
+extern bool olpc_ofw_present(void);
+
 #else /* !CONFIG_OLPC_OPENFIRMWARE */
 
 static inline void olpc_ofw_detect(void) { }
 static inline void setup_olpc_ofw_pgd(void) { }
+static inline bool olpc_ofw_present(void) { return false; }
 
 #endif /* !CONFIG_OLPC_OPENFIRMWARE */
 
arch/x86/kernel/Makefile +1 -0
index 0925676..e977779 100644
@@ -104,6 +104,7 @@ obj-$(CONFIG_SCx200)		+= scx200.o
 scx200-y			+= scx200_32.o
 
 obj-$(CONFIG_OLPC)		+= olpc.o
+obj-$(CONFIG_OLPC_XO1)		+= olpc-xo1.o
 obj-$(CONFIG_OLPC_OPENFIRMWARE)	+= olpc_ofw.o
 obj-$(CONFIG_X86_MRST)		+= mrst.o
 
arch/x86/kernel/olpc-xo1.c new file +140 -0

140 lines not on this page · raw message

arch/x86/kernel/olpc.c +55 -34

143 lines not on this page · raw message

arch/x86/kernel/olpc_ofw.c +6 -0
index 3218aa7..7873204 100644
@@ -74,6 +74,12 @@ int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res,
 }
 EXPORT_SYMBOL_GPL(__olpc_ofw);
 
+bool olpc_ofw_present(void)
+{
+	return olpc_ofw_cif != NULL;
+}
+EXPORT_SYMBOL_GPL(olpc_ofw_present);
+
 /* OFW cif _should_ be above this address */
 #define OFW_MIN 0xff000000
 
arch/x86/pci/olpc.c +1 -1
index b348154..13700ec 100644
@@ -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;