[PATCH] powerpc: Kill _machine and hard-coded platform numbers

This removes statically assigned platform numbers and reworks the
powerpc platform probe code to use a better mechanism.  With this,
board support files can simply declare a new machine type with a
macro, and implement a probe() function that uses the flattened
device-tree to detect if they apply for a given machine.

We now have a machine_is() macro that replaces the comparisons of
_machine with the various PLATFORM_* constants.  This commit also
changes various drivers to use the new macro instead of looking at
_machine.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 155aa690e4bb..6ce8a404ba6b 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -675,9 +675,10 @@ static void iseries_dedicated_idle(void)
 void __init iSeries_init_IRQ(void) { }
 #endif
 
-static int __init iseries_probe(int platform)
+static int __init iseries_probe(void)
 {
-        if (PLATFORM_ISERIES_LPAR != platform)
+        unsigned long root = of_get_flat_dt_root();
+        if (!of_flat_dt_is_compatible(root, "IBM,iSeries"))
                 return 0;
 
         powerpc_firmware_features |= FW_FEATURE_ISERIES;
@@ -686,7 +687,8 @@ static int __init iseries_probe(int platform)
         return 1;
 }
 
-struct machdep_calls __initdata iseries_md = {
+define_machine(iseries) {
+        .name           = "iSeries",
         .setup_arch     = iSeries_setup_arch,
         .show_cpuinfo   = iSeries_show_cpuinfo,
         .init_IRQ       = iSeries_init_IRQ,
@@ -930,7 +932,6 @@ void build_flat_dt(struct iseries_flat_dt *dt, unsigned long phys_mem_size)
 
         /* /chosen */
         dt_start_node(dt, "chosen");
-        dt_prop_u32(dt, "linux,platform", PLATFORM_ISERIES_LPAR);
         dt_prop_str(dt, "bootargs", cmd_line);
         if (cmd_mem_limit)
                 dt_prop_u64(dt, "linux,memory-limit", cmd_mem_limit);