Patched in Tegra support.

1 files changed, 23 insertions, 22 deletions

diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c
index f1beb4971f8..e7a4e2ab6cd 100644
--- a/drivers/mfd/aat2870-core.c
+++ b/drivers/mfd/aat2870-core.c
@@ -79,27 +79,22 @@ static struct mfd_cell aat2870_devs[] = {
         {
                 .name = "aat2870-backlight",
                 .id = AAT2870_ID_BL,
-                .pdata_size = sizeof(struct aat2870_bl_platform_data),
         },
         {
                 .name = "aat2870-regulator",
                 .id = AAT2870_ID_LDOA,
-                .pdata_size = sizeof(struct regulator_init_data),
         },
         {
                 .name = "aat2870-regulator",
                 .id = AAT2870_ID_LDOB,
-                .pdata_size = sizeof(struct regulator_init_data),
         },
         {
                 .name = "aat2870-regulator",
                 .id = AAT2870_ID_LDOC,
-                .pdata_size = sizeof(struct regulator_init_data),
         },
         {
                 .name = "aat2870-regulator",
                 .id = AAT2870_ID_LDOD,
-                .pdata_size = sizeof(struct regulator_init_data),
         },
 };
 
@@ -262,6 +257,13 @@ static ssize_t aat2870_dump_reg(struct aat2870_data *aat2870, char *buf)
         return count;
 }
 
+static int aat2870_reg_open_file(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+
+        return 0;
+}
+
 static ssize_t aat2870_reg_read_file(struct file *file, char __user *user_buf,
                                      size_t count, loff_t *ppos)
 {
@@ -288,7 +290,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
 {
         struct aat2870_data *aat2870 = file->private_data;
         char buf[32];
-        ssize_t buf_size;
+        int buf_size;
         char *start = buf;
         unsigned long addr, val;
         int ret;
@@ -323,7 +325,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
 }
 
 static const struct file_operations aat2870_reg_fops = {
-        .open = simple_open,
+        .open = aat2870_reg_open_file,
         .read = aat2870_reg_read_file,
         .write = aat2870_reg_write_file,
 };
@@ -400,13 +402,13 @@ static int aat2870_i2c_probe(struct i2c_client *client,
                 aat2870->init(aat2870);
 
         if (aat2870->en_pin >= 0) {
-                ret = gpio_request_one(aat2870->en_pin, GPIOF_OUT_INIT_HIGH,
-                                       "aat2870-en");
+                ret = gpio_request(aat2870->en_pin, "aat2870-en");
                 if (ret < 0) {
                         dev_err(&client->dev,
                                 "Failed to request GPIO %d\n", aat2870->en_pin);
                         goto out_kfree;
                 }
+                gpio_direction_output(aat2870->en_pin, 1);
         }
 
         aat2870_enable(aat2870);
@@ -416,7 +418,7 @@ static int aat2870_i2c_probe(struct i2c_client *client,
                         if ((pdata->subdevs[i].id == aat2870_devs[j].id) &&
                                         !strcmp(pdata->subdevs[i].name,
                                                 aat2870_devs[j].name)) {
-                                aat2870_devs[j].platform_data =
+                                aat2870_devs[j].mfd_data =
                                         pdata->subdevs[i].platform_data;
                                 break;
                         }
@@ -424,7 +426,7 @@ static int aat2870_i2c_probe(struct i2c_client *client,
         }
 
         ret = mfd_add_devices(aat2870->dev, 0, aat2870_devs,
-                              ARRAY_SIZE(aat2870_devs), NULL, 0, NULL);
+                              ARRAY_SIZE(aat2870_devs), NULL, 0);
         if (ret != 0) {
                 dev_err(aat2870->dev, "Failed to add subdev: %d\n", ret);
                 goto out_disable;
@@ -461,10 +463,9 @@ static int aat2870_i2c_remove(struct i2c_client *client)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int aat2870_i2c_suspend(struct device *dev)
+#ifdef CONFIG_PM
+static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state)
 {
-        struct i2c_client *client = to_i2c_client(dev);
         struct aat2870_data *aat2870 = i2c_get_clientdata(client);
 
         aat2870_disable(aat2870);
@@ -472,9 +473,8 @@ static int aat2870_i2c_suspend(struct device *dev)
         return 0;
 }
 
-static int aat2870_i2c_resume(struct device *dev)
+static int aat2870_i2c_resume(struct i2c_client *client)
 {
-        struct i2c_client *client = to_i2c_client(dev);
         struct aat2870_data *aat2870 = i2c_get_clientdata(client);
         struct aat2870_register *reg = NULL;
         int i;
@@ -490,12 +490,12 @@ static int aat2870_i2c_resume(struct device *dev)
 
         return 0;
 }
-#endif /* CONFIG_PM_SLEEP */
-
-static SIMPLE_DEV_PM_OPS(aat2870_pm_ops, aat2870_i2c_suspend,
-                         aat2870_i2c_resume);
+#else
+#define aat2870_i2c_suspend     NULL
+#define aat2870_i2c_resume      NULL
+#endif /* CONFIG_PM */
 
-static const struct i2c_device_id aat2870_i2c_id_table[] = {
+static struct i2c_device_id aat2870_i2c_id_table[] = {
         { "aat2870", 0 },
         { }
 };
@@ -505,10 +505,11 @@ static struct i2c_driver aat2870_i2c_driver = {
         .driver = {
                 .name   = "aat2870",
                 .owner  = THIS_MODULE,
-                .pm     = &aat2870_pm_ops,
         },
         .probe          = aat2870_i2c_probe,
         .remove         = aat2870_i2c_remove,
+        .suspend        = aat2870_i2c_suspend,
+        .resume         = aat2870_i2c_resume,
         .id_table       = aat2870_i2c_id_table,
 };