Commit c87ea643 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Kleber Sacilotto de Souza

mfd: max8997: Enale irq-wakeup unconditionally

BugLink: https://bugs.launchpad.net/bugs/1854855

[ Upstream commit efddff27 ]

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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent a319885b
...@@ -156,12 +156,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( ...@@ -156,12 +156,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
pd->ono = irq_of_parse_and_map(dev->of_node, 1); 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; return pd;
} }
...@@ -249,7 +243,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c, ...@@ -249,7 +243,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
*/ */
/* MAX8997 has a power button input. */ /* MAX8997 has a power button input. */
device_init_wakeup(max8997->dev, pdata->wakeup); device_init_wakeup(max8997->dev, true);
return ret; return ret;
......
...@@ -178,7 +178,6 @@ struct max8997_led_platform_data { ...@@ -178,7 +178,6 @@ struct max8997_led_platform_data {
struct max8997_platform_data { struct max8997_platform_data {
/* IRQ */ /* IRQ */
int ono; int ono;
int wakeup;
/* ---- PMIC ---- */ /* ---- PMIC ---- */
struct max8997_regulator_data *regulators; struct max8997_regulator_data *regulators;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment