x86, olpc: Use device tree for platform identification (45bb1674) · Commits · 戴 / test

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -2071,7 +2071,7 @@ config OLPC
		depends on !X86_PAE
		select GPIOLIB
		select OF
		select OF_PROMTREE if PROC_DEVICETREE
		select OF_PROMTREE
		---help---
		Add support for detecting the unique features of the OLPC
		XO hardware.

arch/x86/include/asm/olpc_ofw.h

+3 −6

Original line number	Diff line number	Diff line
		@@ -26,15 +26,12 @@ extern void setup_olpc_ofw_pgd(void);
		/* check if OFW was detected during boot */
		extern bool olpc_ofw_present(void);

		extern void olpc_dt_build_devicetree(void);

		#else /* !CONFIG_OLPC */
		static inline void olpc_ofw_detect(void) { }
		static inline void setup_olpc_ofw_pgd(void) { }
		#endif /* !CONFIG_OLPC */

		#ifdef CONFIG_OF_PROMTREE
		extern void olpc_dt_build_devicetree(void);
		#else
		static inline void olpc_dt_build_devicetree(void) { }
		#endif
		#endif /* !CONFIG_OLPC */

		#endif /* _ASM_X86_OLPC_OFW_H */

arch/x86/platform/olpc/Makefile

+1 −3

Original line number	Diff line number	Diff line
		obj-$(CONFIG_OLPC) += olpc.o
		obj-$(CONFIG_OLPC) += olpc.o olpc_ofw.o olpc_dt.o
		obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o
		obj-$(CONFIG_OLPC) += olpc_ofw.o
		obj-$(CONFIG_OF_PROMTREE) += olpc_dt.o

arch/x86/platform/olpc/olpc.c

+27 −24

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

		#include <asm/geode.h>
		#include <asm/setup.h>
		@@ -187,41 +188,43 @@ err:
		}
		EXPORT_SYMBOL_GPL(olpc_ec_cmd);

		static bool __init check_ofw_architecture(void)
		static bool __init check_ofw_architecture(struct device_node *root)
		{
		size_t propsize;
		char olpc_arch[5];
		const void args[] = { NULL, "architecture", olpc_arch, (void )5 };
		void *res[] = { &propsize };
		const char *olpc_arch;
		int propsize;

		if (olpc_ofw("getprop", args, res)) {
		printk(KERN_ERR "ofw: getprop call failed!\n");
		return false;
		}
		olpc_arch = of_get_property(root, "architecture", &propsize);
		return propsize == 5 && strncmp("OLPC", olpc_arch, 5) == 0;
		}

		static u32 __init get_board_revision(void)
		static u32 __init get_board_revision(struct device_node *root)
		{
		size_t propsize;
		__be32 rev;
		const void args[] = { NULL, "board-revision-int", &rev, (void )4 };
		void *res[] = { &propsize };

		if (olpc_ofw("getprop", args, res) \|\| propsize != 4) {
		printk(KERN_ERR "ofw: getprop call failed!\n");
		return cpu_to_be32(0);
		}
		return be32_to_cpu(rev);
		int propsize;
		const __be32 *rev;

		rev = of_get_property(root, "board-revision-int", &propsize);
		if (propsize != 4)
		return 0;

		return be32_to_cpu(*rev);
		}

		static bool __init platform_detect(void)
		{
		if (!check_ofw_architecture())
		struct device_node *root = of_find_node_by_path("/");
		bool success;

		if (!root)
		return false;

		success = check_ofw_architecture(root);
		if (success) {
		olpc_platform_info.boardrev = get_board_revision(root);
		olpc_platform_info.flags \|= OLPC_F_PRESENT;
		olpc_platform_info.boardrev = get_board_revision();
		return true;
		}

		of_node_put(root);
		return success;
		}

		static int __init add_xo1_platform_devices(void)

arch/x86/platform/olpc/olpc_dt.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -19,7 +19,9 @@
		#include <linux/kernel.h>
		#include <linux/bootmem.h>
		#include <linux/of.h>
		#include <linux/of_platform.h>
		#include <linux/of_pdt.h>
		#include <asm/olpc.h>
		#include <asm/olpc_ofw.h>

		static phandle __init olpc_dt_getsibling(phandle node)
		@@ -181,3 +183,20 @@ void __init olpc_dt_build_devicetree(void)
		pr_info("PROM DT: Built device tree with %u bytes of memory.\n",
		prom_early_allocated);
		}

		/* A list of DT node/bus matches that we want to expose as platform devices */
		static struct of_device_id __initdata of_ids[] = {
		{ .compatible = "olpc,xo1-battery" },
		{ .compatible = "olpc,xo1-dcon" },
		{ .compatible = "olpc,xo1-rtc" },
		{},
		};

		static int __init olpc_create_platform_devices(void)
		{
		if (machine_is_olpc())
		return of_platform_bus_probe(NULL, of_ids, NULL);
		else
		return 0;
		}
		device_initcall(olpc_create_platform_devices);

Admin message