diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2018-09-05 07:54:07 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2018-10-23 03:58:34 -0400 |
commit | efddff27c886e729a7f84a7205bd84d7d4af7336 (patch) | |
tree | 93d865d9ffa95507c4895bdfeea83ff87ccafbc8 | |
parent | 8e27a5638ab5c1b5434a0c22bc43ec6c3f7f5b6b (diff) |
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( | |||
139 | 139 | ||
140 | pd->ono = irq_of_parse_and_map(dev->of_node, 1); | 140 | pd->ono = irq_of_parse_and_map(dev->of_node, 1); |
141 | 141 | ||
142 | /* | ||
143 | * ToDo: the 'wakeup' member in the platform data is more of a linux | ||
144 | * specfic information. Hence, there is no binding for that yet and | ||
145 | * not parsed here. | ||
146 | */ | ||
147 | |||
148 | return pd; | 142 | return pd; |
149 | } | 143 | } |
150 | 144 | ||
@@ -232,7 +226,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c, | |||
232 | */ | 226 | */ |
233 | 227 | ||
234 | /* MAX8997 has a power button input. */ | 228 | /* MAX8997 has a power button input. */ |
235 | device_init_wakeup(max8997->dev, pdata->wakeup); | 229 | device_init_wakeup(max8997->dev, true); |
236 | 230 | ||
237 | return ret; | 231 | return ret; |
238 | 232 | ||
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 { | |||
165 | struct max8997_platform_data { | 165 | struct max8997_platform_data { |
166 | /* IRQ */ | 166 | /* IRQ */ |
167 | int ono; | 167 | int ono; |
168 | int wakeup; | ||
169 | 168 | ||
170 | /* ---- PMIC ---- */ | 169 | /* ---- PMIC ---- */ |
171 | struct max8997_regulator_data *regulators; | 170 | struct max8997_regulator_data *regulators; |