CHROMIUM: mfd: max77686: use standard wake setup

If the i2c_board_info struct sets I2C_CLIENT_WAKE (or done through the generic
i2c bindings), then there's no need to initialize wakeup in the driver.
So thus the custom setup and the platform_data member can be removed.

BUG=chrome-os-partner:8921
TEST=rtcwake -m mem -s 10

Change-Id: I7f24684b8a2ac36325b0887b19acb40fa7bf8f53
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/28132
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index a83f959..3a3c75f 100644 (file)
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -134,9 +134,6 @@ static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device
                return ERR_PTR(-ENOMEM);
        }
 
-       if (of_get_property(dev->of_node, "max77686,wakeup", NULL))
-               pd->wakeup = true;
-
        return pd;
 }
 #else
@@ -197,7 +194,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
        max77686->type = max77686_i2c_get_driver_data(i2c, id);
 
        max77686->pdata = pdata;
-       max77686->wakeup = pdata->wakeup;
 
        mutex_init(&max77686->iolock);
 
@@ -214,7 +210,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
        }
 
        pm_runtime_set_active(max77686->dev);
-       device_init_wakeup(max77686->dev, max77686->wakeup);
 
        if (max77686_read_reg(i2c, MAX77686_REG_DEVICE_ID, &data) < 0) {
                ret = -EIO;

diff --git a/include/linux/mfd/max77686.h b/include/linux/mfd/max77686.h
index b959974..646d899 100644 (file)
--- a/include/linux/mfd/max77686.h
+++ b/include/linux/mfd/max77686.h
@@ -88,7 +88,6 @@ struct max77686_regulator_data {
 };
 
 struct max77686_platform_data {
-       bool wakeup;
        u8 ramp_delay;
        struct max77686_regulator_data *regulators;
        int num_regulators;