x86/platform/olpc: Do not call of_platform_bus_probe()

The DT core will probe the DT by default now, so the OLPC platform code
calling of_platform_bus_probe() is not necessary. The algorithm for what
nodes are probed is a little different in how compatible is handled, but
since OLPC uses compatible strings for matching it is not affected by
this difference.

Also, only the battery node located at the root level gets a device
created as the dcon is a PCI device and the RTC device is created in
olpc-xo1-rtc.c.

Signed-off-by: Rob Herring <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
CC: "H. Peter Anvin" <[email protected]>
CC: Ingo Molnar <[email protected]>
CC: Lubomir Rintel <[email protected]>
Cc: Thomas Gleixner <[email protected]>
CC: [email protected]
CC: x86-ml <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]

diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index 24d2175a948038a530078540e3e412240d32706e..b4ab779f1d47aa0bc634a5eecf18fbcf79e67d9f 100644 (file)
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
-#include <linux/of_platform.h>
 #include <linux/of_pdt.h>
 #include <asm/olpc.h>
 #include <asm/olpc_ofw.h>
@@ -285,20 +284,3 @@ 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);