1 files changed, 20 insertions, 27 deletions

diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 8d12a8e00d9c..98edb5be85c6 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -25,6 +25,8 @@
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps65090.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/err.h>
 
 #define NUM_INT_REG 2
@@ -148,18 +150,31 @@ static const struct regmap_config tps65090_regmap_config = {
         .volatile_reg = is_volatile_reg,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id tps65090_of_match[] = {
+        { .compatible = "ti,tps65090",},
+        {},
+};
+MODULE_DEVICE_TABLE(of, tps65090_of_match);
+#endif
+
 static int tps65090_i2c_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
         struct tps65090_platform_data *pdata = client->dev.platform_data;
+        int irq_base = 0;
         struct tps65090 *tps65090;
         int ret;
 
-        if (!pdata) {
-                dev_err(&client->dev, "tps65090 requires platform data\n");
+        if (!pdata && !client->dev.of_node) {
+                dev_err(&client->dev,
+                        "tps65090 requires platform data or of_node\n");
                 return -EINVAL;
         }
 
+        if (pdata)
+                irq_base = pdata->irq_base;
+
         tps65090 = devm_kzalloc(&client->dev, sizeof(*tps65090), GFP_KERNEL);
         if (!tps65090) {
                 dev_err(&client->dev, "mem alloc for tps65090 failed\n");
@@ -178,7 +193,7 @@ static int tps65090_i2c_probe(struct i2c_client *client,
 
         if (client->irq) {
                 ret = regmap_add_irq_chip(tps65090->rmap, client->irq,
-                        IRQF_ONESHOT | IRQF_TRIGGER_LOW, pdata->irq_base,
+                        IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base,
                         &tps65090_irq_chip, &tps65090->irq_data);
                         if (ret) {
                                 dev_err(&client->dev,
@@ -189,7 +204,7 @@ static int tps65090_i2c_probe(struct i2c_client *client,
 
         ret = mfd_add_devices(tps65090->dev, -1, tps65090s,
                 ARRAY_SIZE(tps65090s), NULL,
-                regmap_irq_chip_get_base(tps65090->irq_data), NULL);
+                0, regmap_irq_get_domain(tps65090->irq_data));
         if (ret) {
                 dev_err(&client->dev, "add mfd devices failed with err: %d\n",
                         ret);
@@ -215,28 +230,6 @@ static int tps65090_i2c_remove(struct i2c_client *client)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int tps65090_suspend(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        if (client->irq)
-                disable_irq(client->irq);
-        return 0;
-}
-
-static int tps65090_resume(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        if (client->irq)
-                enable_irq(client->irq);
-        return 0;
-}
-#endif
-
-static const struct dev_pm_ops tps65090_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(tps65090_suspend, tps65090_resume)
-};
-
 static const struct i2c_device_id tps65090_id_table[] = {
         { "tps65090", 0 },
         { },
@@ -247,7 +240,7 @@ static struct i2c_driver tps65090_driver = {
         .driver = {
                 .name   = "tps65090",
                 .owner  = THIS_MODULE,
-                .pm     = &tps65090_pm_ops,
+                .of_match_table = of_match_ptr(tps65090_of_match),
         },
         .probe          = tps65090_i2c_probe,
         .remove         = tps65090_i2c_remove,