[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20101005145454.797109D401B@zog.reactivated.net>
Date: Tue, 5 Oct 2010 15:54:54 +0100 (BST)
From: Daniel Drake <dsd@...top.org>
To: x86@...nel.org
Cc: dilinger@...ued.net
Subject: [PATCH v2] OLPC: register XO-1 RF kill device
The upcoming XO-1 rfkill driver (for drivers/platform/x86) will register
itself with the name "xo1-rfkill"
Add the necessary mechanics so that this is properly probed and
initialized on XO-1 laptops.
Signed-off-by: Daniel Drake <dsd@...top.org>
---
arch/x86/kernel/olpc.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
v2: move platform device creation to separate function
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 37c49934..06c245b 100644
--- a/arch/x86/kernel/olpc.c
+++ b/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>
@@ -220,8 +221,21 @@ 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);
+
+ return 0;
+}
+
static int __init olpc_init(void)
{
+ int r = 0;
+
if (!olpc_ofw_present() || !platform_detect())
return 0;
@@ -248,6 +262,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;
}
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists