diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2018-09-05 13:54:07 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2018-10-23 08:58:34 +0100 |
| commit | efddff27c886e729a7f84a7205bd84d7d4af7336 (patch) | |
| tree | 93d865d9ffa95507c4895bdfeea83ff87ccafbc8 | |
| parent | 8e27a5638ab5c1b5434a0c22bc43ec6c3f7f5b6b (diff) | |
| download | lwn-efddff27c886e729a7f84a7205bd84d7d4af7336.tar.gz lwn-efddff27c886e729a7f84a7205bd84d7d4af7336.zip | |
mfd: max8997: Enale irq-wakeup unconditionally
IRQ wake up support for MAX8997 driver was initially configured by
respective property in pdata. However, after the driver conversion to
device-tree, setting it was left as 'todo'. Nowadays most of other PMIC MFD
drivers initialized from device-tree assume that they can be an irq wakeup
source, so enable it also for MAX8997. This fixes support for wakeup from
MAX8997 RTC alarm.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/max8997.c | 8 | ||||
| -rw-r--r-- | include/linux/mfd/max8997.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 8dbae31911a1..f99e8da99782 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -139,12 +139,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( pd->ono = irq_of_parse_and_map(dev->of_node, 1); - /* - * ToDo: the 'wakeup' member in the platform data is more of a linux - * specfic information. Hence, there is no binding for that yet and - * not parsed here. - */ - return pd; } @@ -232,7 +226,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c, */ /* MAX8997 has a power button input. */ - device_init_wakeup(max8997->dev, pdata->wakeup); + device_init_wakeup(max8997->dev, true); return ret; diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index 3c4e920b4727..e955e2f0a2cc 100644 --- a/include/linux/mfd/max8997.h +++ b/include/linux/mfd/max8997.h @@ -165,7 +165,6 @@ struct max8997_led_platform_data { struct max8997_platform_data { /* IRQ */ int ono; - int wakeup; /* ---- PMIC ---- */ struct max8997_regulator_data *regulators; |