Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Marek Szyprowski and committed by
Lee Jones
efddff27 8e27a563

+1 -8
+1 -7
drivers/mfd/max8997.c
··· 139 139 140 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 142 return pd; 149 143 } 150 144 ··· 226 232 */ 227 233 228 234 /* MAX8997 has a power button input. */ 229 - device_init_wakeup(max8997->dev, pdata->wakeup); 235 + device_init_wakeup(max8997->dev, true); 230 236 231 237 return ret; 232 238
-1
include/linux/mfd/max8997.h
··· 165 165 struct max8997_platform_data { 166 166 /* IRQ */ 167 167 int ono; 168 - int wakeup; 169 168 170 169 /* ---- PMIC ---- */ 171 170 struct max8997_regulator_data *regulators;