[PATCH] 2/5 powerpc: Rework PowerMac i2c part 2

This is the continuation of the previous patch. This one removes the old
PowerMac i2c drivers (i2c-keywest and i2c-pmac-smu) and replaces them
both with a single stub driver that uses the new PowerMac low i2c layer.

Now that i2c-keywest is gone, the low-i2c code is extended to support
interrupt driver transfers. All i2c busses now appear as platform
devices. Compatibility with existing drivers should be maintained as the
i2c bus names have been kept identical, except for the SMU bus but in
that later case, all users has been fixed.

With that patch added, matching a device node to an i2c_adapter becomes
trivial.

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

3 files changed, 16 insertions, 70 deletions

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index a0ea44c3e8b1..7d4a0ac28c06 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -149,14 +149,14 @@ config MAC_EMUMOUSEBTN
 
 config THERM_WINDTUNNEL
         tristate "Support for thermal management on Windtunnel G4s"
-        depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
+        depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
         help
           This driver provides some thermostat and fan control for the desktop
           G4 "Windtunnel"
 
 config THERM_ADT746X
         tristate "Support for thermal mgmnt on laptops with ADT 746x chipset"
-        depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
+        depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
         help
           This driver provides some thermostat and fan control for the
           iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty
@@ -164,7 +164,7 @@ config THERM_ADT746X
 
 config THERM_PM72
         tristate "Support for thermal management on PowerMac G5"
-        depends on I2C && I2C_KEYWEST && PPC_PMAC64
+        depends on I2C && I2C_POWERMAC && PPC_PMAC64
         help
           This driver provides thermostat and fan control for the desktop
           G5 machines. 
@@ -175,14 +175,14 @@ config WINDFARM
 config WINDFARM_PM81
         tristate "Support for thermal management on iMac G5"
         depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
-        select I2C_PMAC_SMU
+        select I2C_POWERMAC
         help
           This driver provides thermal control for the iMacG5
 
 config WINDFARM_PM91
         tristate "Support for thermal management on PowerMac9,1"
         depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
-        select I2C_PMAC_SMU
+        select I2C_POWERMAC
         help
           This driver provides thermal control for the PowerMac9,1
           which is the recent (SMU based) single CPU desktop G5
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 9ecd76849e35..db2ae71d07ef 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -584,34 +584,14 @@ core_initcall(smu_late_init);
  * sysfs visibility
  */
 
-static void smu_create_i2c(struct device_node *np)
-{
-        char name[32];
-        u32 *reg = (u32 *)get_property(np, "reg", NULL);
-
-        if (reg != NULL) {
-                sprintf(name, "smu-i2c-%02x", *reg);
-                of_platform_device_create(np, name, &smu->of_dev->dev);
-        }
-}
-
 static void smu_expose_childs(void *unused)
 {
-        struct device_node *np, *gp;
-
-        for (np = NULL; (np = of_get_next_child(smu->of_node, np)) != NULL;) {
-                if (device_is_compatible(np, "smu-i2c-control")) {
-                        gp = NULL;
-                        while ((gp = of_get_next_child(np, gp)) != NULL)
-                                if (device_is_compatible(gp, "i2c-bus"))
-                                        smu_create_i2c(gp);
-                } else if (device_is_compatible(np, "smu-i2c"))
-                        smu_create_i2c(np);
+        struct device_node *np;
+
+        for (np = NULL; (np = of_get_next_child(smu->of_node, np)) != NULL;)
                 if (device_is_compatible(np, "smu-sensors"))
                         of_platform_device_create(np, "smu-sensors",
                                                   &smu->of_dev->dev);
-        }
-
 }
 
 static DECLARE_WORK(smu_expose_childs_work, smu_expose_childs, NULL);
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 57460e46c89f..906d3ecae6e6 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/sections.h>
+#include <asm/pmac_low_i2c.h>
 
 #include "windfarm.h"
 
@@ -157,53 +158,21 @@ static struct wf_lm75_sensor *wf_lm75_create(struct i2c_adapter *adapter,
 
 static int wf_lm75_attach(struct i2c_adapter *adapter)
 {
-        u8 bus_id;
-        struct device_node *smu, *bus, *dev;
-
-        /* We currently only deal with LM75's hanging off the SMU
-         * i2c busses. If we extend that driver to other/older
-         * machines, we should split this function into SMU-i2c,
-         * keywest-i2c, PMU-i2c, ...
-         */
+        struct device_node *busnode, *dev;
+        struct pmac_i2c_bus *bus;
 
         DBG("wf_lm75: adapter %s detected\n", adapter->name);
 
-        if (strncmp(adapter->name, "smu-i2c-", 8) != 0)
-                return 0;
-        smu = of_find_node_by_type(NULL, "smu");
-        if (smu == NULL)
-                return 0;
-
-        /* Look for the bus in the device-tree */
-        bus_id = (u8)simple_strtoul(adapter->name + 8, NULL, 16);
-
-        DBG("wf_lm75: bus ID is %x\n", bus_id);
-
-        /* Look for sensors subdir */
-        for (bus = NULL;
-             (bus = of_get_next_child(smu, bus)) != NULL;) {
-                u32 *reg;
-
-                if (strcmp(bus->name, "i2c"))
-                        continue;
-                reg = (u32 *)get_property(bus, "reg", NULL);
-                if (reg == NULL)
-                        continue;
-                if (bus_id == *reg)
-                        break;
-        }
-        of_node_put(smu);
-        if (bus == NULL) {
-                printk(KERN_WARNING "windfarm: SMU i2c bus 0x%x not found"
-                       " in device-tree !\n", bus_id);
-                return 0;
-        }
+        bus = pmac_i2c_adapter_to_bus(adapter);
+        if (bus == NULL)
+                return -ENODEV;
+        busnode = pmac_i2c_get_bus_node(bus);
 
         DBG("wf_lm75: bus found, looking for device...\n");
 
         /* Now look for lm75(s) in there */
         for (dev = NULL;
-             (dev = of_get_next_child(bus, dev)) != NULL;) {
+             (dev = of_get_next_child(busnode, dev)) != NULL;) {
                 const char *loc =
                         get_property(dev, "hwsensor-location", NULL);
                 u32 *reg = (u32 *)get_property(dev, "reg", NULL);
@@ -217,9 +186,6 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
                 else if (device_is_compatible(dev, "ds1775"))
                         wf_lm75_create(adapter, *reg, 1, loc);
         }
-
-        of_node_put(bus);
-
         return 0;
 }