Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git] / drivers / mfd / 88pm860x-i2c.c
index b2cfdc4..ff8f803 100644 (file)
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/err.h>
 #include <linux/regmap.h>
 #include <linux/mfd/88pm860x.h>
-#include <linux/slab.h>
 
 int pm860x_reg_read(struct i2c_client *i2c, int reg)
 {
@@ -91,8 +88,18 @@ static int read_device(struct i2c_client *i2c, int reg,
        unsigned char msgbuf0[I2C_SMBUS_BLOCK_MAX + 3];
        unsigned char msgbuf1[I2C_SMBUS_BLOCK_MAX + 2];
        struct i2c_adapter *adap = i2c->adapter;
-       struct i2c_msg msg[2] = {{i2c->addr, 0, 1, msgbuf0},
-                                {i2c->addr, I2C_M_RD, 0, msgbuf1},
+       struct i2c_msg msg[2] = {
+                                       {
+                                               .addr = i2c->addr,
+                                               .flags = 0,
+                                               .len = 1,
+                                               .buf = msgbuf0
+                                       },
+                                       {       .addr = i2c->addr,
+                                               .flags = I2C_M_RD,
+                                               .len = 0,
+                                               .buf = msgbuf1
+                                       },
                                };
        int num = 1, ret = 0;
 
@@ -231,160 +238,3 @@ out:
        return ret;
 }
 EXPORT_SYMBOL(pm860x_page_set_bits);
-
-static const struct i2c_device_id pm860x_id_table[] = {
-       { "88PM860x", 0 },
-       {}
-};
-MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
-
-static int verify_addr(struct i2c_client *i2c)
-{
-       unsigned short addr_8607[] = {0x30, 0x34};
-       unsigned short addr_8606[] = {0x10, 0x11};
-       int size, i;
-
-       if (i2c == NULL)
-               return 0;
-       size = ARRAY_SIZE(addr_8606);
-       for (i = 0; i < size; i++) {
-               if (i2c->addr == *(addr_8606 + i))
-                       return CHIP_PM8606;
-       }
-       size = ARRAY_SIZE(addr_8607);
-       for (i = 0; i < size; i++) {
-               if (i2c->addr == *(addr_8607 + i))
-                       return CHIP_PM8607;
-       }
-       return 0;
-}
-
-static struct regmap_config pm860x_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-};
-
-static int __devinit pm860x_probe(struct i2c_client *client,
-                                 const struct i2c_device_id *id)
-{
-       struct pm860x_platform_data *pdata = client->dev.platform_data;
-       struct pm860x_chip *chip;
-       int ret;
-
-       if (!pdata) {
-               pr_info("No platform data in %s!\n", __func__);
-               return -EINVAL;
-       }
-
-       chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);
-       if (chip == NULL)
-               return -ENOMEM;
-
-       chip->id = verify_addr(client);
-       chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
-       if (IS_ERR(chip->regmap)) {
-               ret = PTR_ERR(chip->regmap);
-               dev_err(&client->dev, "Failed to allocate register map: %d\n",
-                               ret);
-               kfree(chip);
-               return ret;
-       }
-       chip->client = client;
-       i2c_set_clientdata(client, chip);
-       chip->dev = &client->dev;
-       dev_set_drvdata(chip->dev, chip);
-
-       /*
-        * Both client and companion client shares same platform driver.
-        * Driver distinguishes them by pdata->companion_addr.
-        * pdata->companion_addr is only assigned if companion chip exists.
-        * At the same time, the companion_addr shouldn't equal to client
-        * address.
-        */
-       if (pdata->companion_addr && (pdata->companion_addr != client->addr)) {
-               chip->companion_addr = pdata->companion_addr;
-               chip->companion = i2c_new_dummy(chip->client->adapter,
-                                               chip->companion_addr);
-               chip->regmap_companion = regmap_init_i2c(chip->companion,
-                                                       &pm860x_regmap_config);
-               if (IS_ERR(chip->regmap_companion)) {
-                       ret = PTR_ERR(chip->regmap_companion);
-                       dev_err(&chip->companion->dev,
-                               "Failed to allocate register map: %d\n", ret);
-                       return ret;
-               }
-               i2c_set_clientdata(chip->companion, chip);
-       }
-
-       pm860x_device_init(chip, pdata);
-       return 0;
-}
-
-static int __devexit pm860x_remove(struct i2c_client *client)
-{
-       struct pm860x_chip *chip = i2c_get_clientdata(client);
-
-       pm860x_device_exit(chip);
-       if (chip->companion) {
-               regmap_exit(chip->regmap_companion);
-               i2c_unregister_device(chip->companion);
-       }
-       regmap_exit(chip->regmap);
-       kfree(chip);
-       return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int pm860x_suspend(struct device *dev)
-{
-       struct i2c_client *client = container_of(dev, struct i2c_client, dev);
-       struct pm860x_chip *chip = i2c_get_clientdata(client);
-
-       if (device_may_wakeup(dev) && chip->wakeup_flag)
-               enable_irq_wake(chip->core_irq);
-       return 0;
-}
-
-static int pm860x_resume(struct device *dev)
-{
-       struct i2c_client *client = container_of(dev, struct i2c_client, dev);
-       struct pm860x_chip *chip = i2c_get_clientdata(client);
-
-       if (device_may_wakeup(dev) && chip->wakeup_flag)
-               disable_irq_wake(chip->core_irq);
-       return 0;
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);
-
-static struct i2c_driver pm860x_driver = {
-       .driver = {
-               .name   = "88PM860x",
-               .owner  = THIS_MODULE,
-               .pm     = &pm860x_pm_ops,
-       },
-       .probe          = pm860x_probe,
-       .remove         = __devexit_p(pm860x_remove),
-       .id_table       = pm860x_id_table,
-};
-
-static int __init pm860x_i2c_init(void)
-{
-       int ret;
-       ret = i2c_add_driver(&pm860x_driver);
-       if (ret != 0)
-               pr_err("Failed to register 88PM860x I2C driver: %d\n", ret);
-       return ret;
-}
-subsys_initcall(pm860x_i2c_init);
-
-static void __exit pm860x_i2c_exit(void)
-{
-       i2c_del_driver(&pm860x_driver);
-}
-module_exit(pm860x_i2c_exit);
-
-MODULE_DESCRIPTION("I2C Driver for Marvell 88PM860x");
-MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
-MODULE_LICENSE("GPL");