x86, olpc: Register XO-1 platform devices (447b1d43) · Commits · 戴 / test

arch/x86/kernel/olpc.c

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#include <linux/spinlock.h>		#include <linux/spinlock.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/string.h>		#include <linux/string.h>
			#include <linux/platform_device.h>

	#include <asm/geode.h>		#include <asm/geode.h>
	#include <asm/setup.h>		#include <asm/setup.h>
	@@ -223,8 +224,25 @@ static bool __init platform_detect(void)
	return true;		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)		static int __init olpc_init(void)
	{		{
			int r = 0;

	if (!olpc_ofw_present() \|\| !platform_detect())		if (!olpc_ofw_present() \|\| !platform_detect())
	return 0;		return 0;

	@@ -251,6 +269,12 @@ static int __init olpc_init(void)
	olpc_platform_info.boardrev >> 4,		olpc_platform_info.boardrev >> 4,
	olpc_platform_info.ecver);		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;		return 0;
	}		}