Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-viapro: Add support for SMBus Process Call transactions
  i2c: Restore i2c_smbus_process_call function
  i2c: Do earlier driver model init
  i2c: Only build Tyan SMBus mux drivers on x86
  i2c: Guard against oopses from bad init sequences
  i2c: Document the implementation details of the /dev interface
  i2c: Improve dev-interface documentation
  i2c-parport-light: Don't register a platform device resource
  hwmon: (dme1737) Convert to a new-style i2c driver
  hwmon: (dme1737) Be less i2c-centric
  i2c/tps65010: Vibrator hookup to gpiolib
  i2c-viapro: Add VX800/VX820 support
  i2c: Renesas Highlander FPGA SMBus support
  i2c-pca-isa: Don't grab arbitrary resources
  i2c/isp1301_omap: Convert to a new-style i2c driver, part 2
  i2c/isp1301_omap: Convert to a new-style i2c driver, part 1

2 files changed, 64 insertions, 89 deletions

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 4655b794ebe3..28902ebd5539 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -49,10 +49,9 @@ MODULE_LICENSE("GPL");
 
 struct isp1301 {
         struct otg_transceiver  otg;
-        struct i2c_client       client;
+        struct i2c_client       *client;
         void                    (*i2c_release)(struct device *dev);
 
-        int                     irq;
         int                     irq_type;
 
         u32                     last_otg_ctrl;
@@ -138,14 +137,6 @@ static inline void notresponding(struct isp1301 *isp)
 
 /*-------------------------------------------------------------------------*/
 
-/* only two addresses possible */
-#define ISP_BASE                0x2c
-static unsigned short normal_i2c[] = {
-        ISP_BASE, ISP_BASE + 1,
-        I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
-
 static struct i2c_driver isp1301_driver;
 
 /* smbus apis are used for portability */
@@ -153,25 +144,25 @@ static struct i2c_driver isp1301_driver;
 static inline u8
 isp1301_get_u8(struct isp1301 *isp, u8 reg)
 {
-        return i2c_smbus_read_byte_data(&isp->client, reg + 0);
+        return i2c_smbus_read_byte_data(isp->client, reg + 0);
 }
 
 static inline int
 isp1301_get_u16(struct isp1301 *isp, u8 reg)
 {
-        return i2c_smbus_read_word_data(&isp->client, reg);
+        return i2c_smbus_read_word_data(isp->client, reg);
 }
 
 static inline int
 isp1301_set_bits(struct isp1301 *isp, u8 reg, u8 bits)
 {
-        return i2c_smbus_write_byte_data(&isp->client, reg + 0, bits);
+        return i2c_smbus_write_byte_data(isp->client, reg + 0, bits);
 }
 
 static inline int
 isp1301_clear_bits(struct isp1301 *isp, u8 reg, u8 bits)
 {
-        return i2c_smbus_write_byte_data(&isp->client, reg + 1, bits);
+        return i2c_smbus_write_byte_data(isp->client, reg + 1, bits);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -349,10 +340,10 @@ isp1301_defer_work(struct isp1301 *isp, int work)
         int status;
 
         if (isp && !test_and_set_bit(work, &isp->todo)) {
-                (void) get_device(&isp->client.dev);
+                (void) get_device(&isp->client->dev);
                 status = schedule_work(&isp->work);
                 if (!status && !isp->working)
-                        dev_vdbg(&isp->client.dev,
+                        dev_vdbg(&isp->client->dev,
                                 "work item %d may be lost\n", work);
         }
 }
@@ -1135,7 +1126,7 @@ isp1301_work(struct work_struct *work)
                 /* transfer state from otg engine to isp1301 */
                 if (test_and_clear_bit(WORK_UPDATE_ISP, &isp->todo)) {
                         otg_update_isp(isp);
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 #endif
                 /* transfer state from isp1301 to otg engine */
@@ -1143,7 +1134,7 @@ isp1301_work(struct work_struct *work)
                         u8              stat = isp1301_clear_latch(isp);
 
                         isp_update_otg(isp, stat);
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 
                 if (test_and_clear_bit(WORK_HOST_RESUME, &isp->todo)) {
@@ -1178,7 +1169,7 @@ isp1301_work(struct work_struct *work)
                         }
                         host_resume(isp);
                         // mdelay(10);
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 
                 if (test_and_clear_bit(WORK_TIMER, &isp->todo)) {
@@ -1187,15 +1178,15 @@ isp1301_work(struct work_struct *work)
                         if (!stop)
                                 mod_timer(&isp->timer, jiffies + TIMER_JIFFIES);
 #endif
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 
                 if (isp->todo)
-                        dev_vdbg(&isp->client.dev,
+                        dev_vdbg(&isp->client->dev,
                                 "work done, todo = 0x%lx\n",
                                 isp->todo);
                 if (stop) {
-                        dev_dbg(&isp->client.dev, "stop\n");
+                        dev_dbg(&isp->client->dev, "stop\n");
                         break;
                 }
         } while (isp->todo);
@@ -1219,7 +1210,7 @@ static void isp1301_release(struct device *dev)
 {
         struct isp1301  *isp;
 
-        isp = container_of(dev, struct isp1301, client.dev);
+        isp = dev_get_drvdata(dev);
 
         /* ugly -- i2c hijacks our memory hook to wait_for_completion() */
         if (isp->i2c_release)
@@ -1229,15 +1220,15 @@ static void isp1301_release(struct device *dev)
 
 static struct isp1301 *the_transceiver;
 
-static int isp1301_detach_client(struct i2c_client *i2c)
+static int __exit isp1301_remove(struct i2c_client *i2c)
 {
         struct isp1301  *isp;
 
-        isp = container_of(i2c, struct isp1301, client);
+        isp = i2c_get_clientdata(i2c);
 
         isp1301_clear_bits(isp, ISP1301_INTERRUPT_FALLING, ~0);
         isp1301_clear_bits(isp, ISP1301_INTERRUPT_RISING, ~0);
-        free_irq(isp->irq, isp);
+        free_irq(i2c->irq, isp);
 #ifdef  CONFIG_USB_OTG
         otg_unbind(isp);
 #endif
@@ -1252,7 +1243,7 @@ static int isp1301_detach_client(struct i2c_client *i2c)
         put_device(&i2c->dev);
         the_transceiver = 0;
 
-        return i2c_detach_client(i2c);
+        return 0;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1285,7 +1276,7 @@ static int isp1301_otg_enable(struct isp1301 *isp)
         isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
                 INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);
 
-        dev_info(&isp->client.dev, "ready for dual-role USB ...\n");
+        dev_info(&isp->client->dev, "ready for dual-role USB ...\n");
 
         return 0;
 }
@@ -1310,7 +1301,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 
 #ifdef  CONFIG_USB_OTG
         isp->otg.host = host;
-        dev_dbg(&isp->client.dev, "registered host\n");
+        dev_dbg(&isp->client->dev, "registered host\n");
         host_suspend(isp);
         if (isp->otg.gadget)
                 return isp1301_otg_enable(isp);
@@ -1325,7 +1316,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
         if (machine_is_omap_h2())
                 isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
 
-        dev_info(&isp->client.dev, "A-Host sessions ok\n");
+        dev_info(&isp->client->dev, "A-Host sessions ok\n");
         isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
                 INTR_ID_GND);
         isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
@@ -1343,7 +1334,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
         return 0;
 
 #else
-        dev_dbg(&isp->client.dev, "host sessions not allowed\n");
+        dev_dbg(&isp->client->dev, "host sessions not allowed\n");
         return -EINVAL;
 #endif
 
@@ -1370,7 +1361,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 
 #ifdef  CONFIG_USB_OTG
         isp->otg.gadget = gadget;
-        dev_dbg(&isp->client.dev, "registered gadget\n");
+        dev_dbg(&isp->client->dev, "registered gadget\n");
         /* gadget driver may be suspended until vbus_connect () */
         if (isp->otg.host)
                 return isp1301_otg_enable(isp);
@@ -1395,7 +1386,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
                 INTR_SESS_VLD);
         isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
                 INTR_VBUS_VLD);
-        dev_info(&isp->client.dev, "B-Peripheral sessions ok\n");
+        dev_info(&isp->client->dev, "B-Peripheral sessions ok\n");
         dump_regs(isp, __func__);
 
         /* If this has a Mini-AB connector, this mode is highly
@@ -1408,7 +1399,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
         return 0;
 
 #else
-        dev_dbg(&isp->client.dev, "peripheral sessions not allowed\n");
+        dev_dbg(&isp->client->dev, "peripheral sessions not allowed\n");
         return -EINVAL;
 #endif
 }
@@ -1508,12 +1499,10 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 
 /*-------------------------------------------------------------------------*/
 
-/* no error returns, they'd just make bus scanning stop */
-static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
+static int __init isp1301_probe(struct i2c_client *i2c)
 {
         int                     status;
         struct isp1301          *isp;
-        struct i2c_client       *i2c;
 
         if (the_transceiver)
                 return 0;
@@ -1527,37 +1516,19 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
         isp->timer.function = isp1301_timer;
         isp->timer.data = (unsigned long) isp;
 
-        isp->irq = -1;
-        isp->client.addr = address;
-        i2c_set_clientdata(&isp->client, isp);
-        isp->client.adapter = bus;
-        isp->client.driver = &isp1301_driver;
-        strlcpy(isp->client.name, DRIVER_NAME, I2C_NAME_SIZE);
-        i2c = &isp->client;
-
-        /* if this is a true probe, verify the chip ... */
-        if (kind < 0) {
-                status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);
-                if (status != I2C_VENDOR_ID_PHILIPS) {
-                        dev_dbg(&bus->dev, "addr %d not philips id: %d\n",
-                                address, status);
-                        goto fail1;
-                }
-                status = isp1301_get_u16(isp, ISP1301_PRODUCT_ID);
-                if (status != I2C_PRODUCT_ID_PHILIPS_1301) {
-                        dev_dbg(&bus->dev, "%d not isp1301, %d\n",
-                                address, status);
-                        goto fail1;
-                }
-        }
+        i2c_set_clientdata(i2c, isp);
+        isp->client = i2c;
 
-        status = i2c_attach_client(i2c);
-        if (status < 0) {
-                dev_dbg(&bus->dev, "can't attach %s to device %d, err %d\n",
-                                DRIVER_NAME, address, status);
-fail1:
-                kfree(isp);
-                return 0;
+        /* verify the chip (shouldn't be necesary) */
+        status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);
+        if (status != I2C_VENDOR_ID_PHILIPS) {
+                dev_dbg(&i2c->dev, "not philips id: %d\n", status);
+                goto fail;
+        }
+        status = isp1301_get_u16(isp, ISP1301_PRODUCT_ID);
+        if (status != I2C_PRODUCT_ID_PHILIPS_1301) {
+                dev_dbg(&i2c->dev, "not isp1301, %d\n", status);
+                goto fail;
         }
         isp->i2c_release = i2c->dev.release;
         i2c->dev.release = isp1301_release;
@@ -1586,7 +1557,7 @@ fail1:
         status = otg_bind(isp);
         if (status < 0) {
                 dev_dbg(&i2c->dev, "can't bind OTG\n");
-                goto fail2;
+                goto fail;
         }
 #endif
 
@@ -1599,26 +1570,21 @@ fail1:
 
                 /* IRQ wired at M14 */
                 omap_cfg_reg(M14_1510_GPIO2);
-                isp->irq = OMAP_GPIO_IRQ(2);
                 if (gpio_request(2, "isp1301") == 0)
                         gpio_direction_input(2);
                 isp->irq_type = IRQF_TRIGGER_FALLING;
         }
 
         isp->irq_type |= IRQF_SAMPLE_RANDOM;
-        status = request_irq(isp->irq, isp1301_irq,
+        status = request_irq(i2c->irq, isp1301_irq,
                         isp->irq_type, DRIVER_NAME, isp);
         if (status < 0) {
                 dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
-                                isp->irq, status);
-#ifdef  CONFIG_USB_OTG
-fail2:
-#endif
-                i2c_detach_client(i2c);
-                goto fail1;
+                                i2c->irq, status);
+                goto fail;
         }
 
-        isp->otg.dev = &isp->client.dev;
+        isp->otg.dev = &i2c->dev;
         isp->otg.label = DRIVER_NAME;
 
         isp->otg.set_host = isp1301_set_host,
@@ -1649,22 +1615,25 @@ fail2:
                         status);
 
         return 0;
-}
 
-static int isp1301_scan_bus(struct i2c_adapter *bus)
-{
-        if (!i2c_check_functionality(bus, I2C_FUNC_SMBUS_BYTE_DATA
-                        | I2C_FUNC_SMBUS_READ_WORD_DATA))
-                return -EINVAL;
-        return i2c_probe(bus, &addr_data, isp1301_probe);
+fail:
+        kfree(isp);
+        return -ENODEV;
 }
 
+static const struct i2c_device_id isp1301_id[] = {
+        { "isp1301_omap", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, isp1301_id);
+
 static struct i2c_driver isp1301_driver = {
         .driver = {
                 .name   = "isp1301_omap",
         },
-        .attach_adapter = isp1301_scan_bus,
-        .detach_client  = isp1301_detach_client,
+        .probe          = isp1301_probe,
+        .remove         = __exit_p(isp1301_remove),
+        .id_table       = isp1301_id,
 };
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index cf02e8fceb42..acf8b9d5f575 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -456,14 +456,17 @@ static irqreturn_t tps65010_irq(int irq, void *_tps)
 
 /* offsets 0..3 == GPIO1..GPIO4
  * offsets 4..5 == LED1/nPG, LED2 (we set one of the non-BLINK modes)
+ * offset 6 == vibrator motor driver
  */
 static void
 tps65010_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
         if (offset < 4)
                 tps65010_set_gpio_out_value(offset + 1, value);
-        else
+        else if (offset < 6)
                 tps65010_set_led(offset - 3, value ? ON : OFF);
+        else
+                tps65010_set_vib(value);
 }
 
 static int
@@ -477,8 +480,10 @@ tps65010_output(struct gpio_chip *chip, unsigned offset, int value)
                 if (!(tps->outmask & (1 << offset)))
                         return -EINVAL;
                 tps65010_set_gpio_out_value(offset + 1, value);
-        } else
+        } else if (offset < 6)
                 tps65010_set_led(offset - 3, value ? ON : OFF);
+        else
+                tps65010_set_vib(value);
 
         return 0;
 }
@@ -646,7 +651,7 @@ static int tps65010_probe(struct i2c_client *client,
                 tps->chip.get = tps65010_gpio_get;
 
                 tps->chip.base = board->base;
-                tps->chip.ngpio = 6;
+                tps->chip.ngpio = 7;
                 tps->chip.can_sleep = 1;
 
                 status = gpiochip_add(&tps->chip);
@@ -675,6 +680,7 @@ static const struct i2c_device_id tps65010_id[] = {
         { "tps65011", TPS65011 },
         { "tps65012", TPS65012 },
         { "tps65013", TPS65013 },
+        { "tps65014", TPS65011 },       /* tps65011 charging at 6.5V max */
         { }
 };
 MODULE_DEVICE_TABLE(i2c, tps65010_id);