[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>

1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 4010fe92e72b..08d5b8fed2dc 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -236,27 +236,17 @@ config I2C_IXP2000
           This support is also available as a module. If so, the module
           will be called i2c-ixp2000.
 
-config I2C_KEYWEST
-        tristate "Powermac Keywest I2C interface"
+config I2C_POWERMAC
+        tristate "Powermac I2C interface"
         depends on I2C && PPC_PMAC
+        default y
         help
-          This supports the use of the I2C interface in the combo-I/O
-          chip on recent Apple machines.  Say Y if you have such a machine.
-
-          This support is also available as a module.  If so, the module 
-          will be called i2c-keywest.
-
-config I2C_PMAC_SMU
-        tristate "Powermac SMU I2C interface"
-        depends on I2C && PMAC_SMU
-        help
-          This supports the use of the I2C interface in the SMU
-          chip on recent Apple machines like the iMac G5.  It is used
-          among others by the thermal control driver for those machines.
-          Say Y if you have such a machine.
+          This exposes the various PowerMac i2c interfaces to the linux i2c
+          layer and to userland. It is used by various drivers on the powemac
+          platform, thus should generally be enabled.
 
           This support is also available as a module.  If so, the module
-          will be called i2c-pmac-smu.
+          will be called i2c-powermac.
 
 config I2C_MPC
         tristate "MPC107/824x/85xx/52xx"