From d63cfdd0fe1081c5f5feb5fb866deabd8488cb56 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 13 Oct 2010 19:10:42 +0100
Subject: [PATCH] --- yaml --- r: 212087 b: refs/heads/master c:
 447b1d43ded08c11f4f3d344b4e07e6dcddbef95 h: refs/heads/master i:   212085:
 ee8c8289bccca548194aa2da3bf659177f458942   212083:
 adc3a21957ede53ff9e62b1471e6c4e1a6eaecbc   212079:
 734b2c673616a9aeb55d7a8cec46871741b4f65e v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/kernel/olpc.c | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b9c488e155ae..719cf0362be0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf1ebf007911d70a89de9a4a1b36d403e8eb064b
+refs/heads/master: 447b1d43ded08c11f4f3d344b4e07e6dcddbef95
diff --git a/trunk/arch/x86/kernel/olpc.c b/trunk/arch/x86/kernel/olpc.c
index 747261302598..edaf3fe8dc5e 100644
--- a/trunk/arch/x86/kernel/olpc.c
+++ b/trunk/arch/x86/kernel/olpc.c
@@ -17,6 +17,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/platform_device.h>
 
 #include <asm/geode.h>
 #include <asm/setup.h>
@@ -223,8 +224,25 @@ static bool __init platform_detect(void)
 	return true;
 }
 
+static int __init add_xo1_platform_devices(void)
+{
+	struct platform_device *pdev;
+
+	pdev = platform_device_register_simple("xo1-rfkill", -1, NULL, 0);
+	if (IS_ERR(pdev))
+		return PTR_ERR(pdev);
+
+	pdev = platform_device_register_simple("olpc-xo1", -1, NULL, 0);
+	if (IS_ERR(pdev))
+		return PTR_ERR(pdev);
+
+	return 0;
+}
+
 static int __init olpc_init(void)
 {
+	int r = 0;
+
 	if (!olpc_ofw_present() || !platform_detect())
 		return 0;
 
@@ -251,6 +269,12 @@ static int __init olpc_init(void)
 			olpc_platform_info.boardrev >> 4,
 			olpc_platform_info.ecver);
 
+	if (olpc_platform_info.boardrev < olpc_board_pre(0xd0)) { /* XO-1 */
+		r = add_xo1_platform_devices();
+		if (r)
+			return r;
+	}
+
 	return 0;
 }