Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a6fa611 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman
Browse files

mfd: max8997: Enale irq-wakeup unconditionally 



[ Upstream commit efddff27c886e729a7f84a7205bd84d7d4af7336 ]

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>
parent 5a04242e

drivers/mfd/max8997.c

+1 −7
Original line number Diff line number Diff line
@@ -153,12 +153,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;

}
@@ -246,7 +240,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;

include/linux/mfd/max8997.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ struct max8997_led_platform_data { 
struct max8997_platform_data {

	/* IRQ */

	int ono;

	int wakeup;



	/* ---- PMIC ---- */

	struct max8997_regulator_data *regulators;