summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-11-04 15:27:41 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-11-11 16:12:19 -0800
commit172bb5f34c0dd5e94eb877edb3e8721d1ebd5c75 (patch)
tree948979b0a3095b38680d45f0cc9840e99b3b2b63 /drivers/input
parentef536abd3afd1e3cbddf04c724db793f12ab9c44 (diff)
downloadlinux-172bb5f34c0dd5e94eb877edb3e8721d1ebd5c75.tar.gz
linux-172bb5f34c0dd5e94eb877edb3e8721d1ebd5c75.tar.bz2
linux-172bb5f34c0dd5e94eb877edb3e8721d1ebd5c75.zip
Input: ili210x - do not unconditionally mark touchscreen as wakeup source
I2C devices that are supposed to be wakeup sources should be instantiated with I2C_CLIENT_WAKE flag (which can be either set by in board info, or retrieved from "wakeup-source" property); individual drivers should not be marking devices as wakeup sources unconditionally. Tested-by: Adam Ford <aford173@gmail.com> #imx6q-logicpd Tested-by: Sven Van Asbroeck <TheSven73@gmail.com> # ILI2118A variant Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ili210x.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 22811df82044..ef0da2fc8bd3 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -439,8 +439,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
return error;
}
- device_init_wakeup(dev, 1);
-
dev_dbg(dev,
"ILI210x initialized (IRQ: %d), firmware version %d.%d.%d",
client->irq, firmware.id, firmware.major, firmware.minor);