mfd: max8997: Enale irq-wakeup unconditionally (efddff27) · Commits · 戴 / test

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>

drivers/mfd/max8997.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -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;

include/linux/mfd/max8997.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,6 @@ struct max8997_led_platform_data {
		struct max8997_platform_data {
		/* IRQ */
		int ono;
		int wakeup;

		/* ---- PMIC ---- */
		struct max8997_regulator_data *regulators;

Admin message