linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: "russianneuromancer @ ya . ru" <russianneuromancer@ya.ru>,
	Gregor Riepl <onitake@gmail.com>,
	linux-input@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>
Subject: [PATCH] Input: silead - Add support for ACPI bus power methods
Date: Sun,  1 Jan 2017 22:30:04 +0100	[thread overview]
Message-ID: <20170101213004.31050-1-hdegoede@redhat.com> (raw)

On some x86 tablets we cannot directly access the GPIOs as they are
claimed by the ACPI tables, so first try using acpi_bus_set_power
and if that works use that instead of directly accessing the GPIO.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/input/touchscreen/silead.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index f502c84..d3dd9bb 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -30,6 +30,7 @@
 #include <linux/pm.h>
 #include <linux/irq.h>
 
+#include <acpi/acpi_bus.h>
 #include <asm/unaligned.h>
 
 #define SILEAD_TS_NAME		"silead_ts"
@@ -71,6 +72,7 @@ enum silead_ts_power {
 
 struct silead_ts_data {
 	struct i2c_client *client;
+	bool acpi_power;
 	struct gpio_desc *gpio_power;
 	struct input_dev *input;
 	char fw_name[64];
@@ -125,7 +127,14 @@ static void silead_ts_set_power(struct i2c_client *client,
 {
 	struct silead_ts_data *data = i2c_get_clientdata(client);
 
-	if (data->gpio_power) {
+	if (data->acpi_power) {
+#ifdef CONFIG_ACPI
+		int ret = acpi_bus_set_power(ACPI_HANDLE(&client->dev),
+					state ? ACPI_STATE_D0 : ACPI_STATE_D3);
+		if (ret)
+			dev_err(&client->dev, "Power error %d\n", ret);
+#endif
+	} else if (data->gpio_power) {
 		gpiod_set_value_cansleep(data->gpio_power, state);
 		msleep(SILEAD_POWER_SLEEP);
 	}
@@ -465,12 +474,21 @@ static int silead_ts_probe(struct i2c_client *client,
 	if (client->irq <= 0)
 		return -ENODEV;
 
-	/* Power GPIO pin */
-	data->gpio_power = devm_gpiod_get_optional(dev, "power", GPIOD_OUT_LOW);
-	if (IS_ERR(data->gpio_power)) {
-		if (PTR_ERR(data->gpio_power) != -EPROBE_DEFER)
-			dev_err(dev, "Shutdown GPIO request failed\n");
-		return PTR_ERR(data->gpio_power);
+	/* Power handling, try ACPI companion method first then GPIO */
+#ifdef CONFIG_ACPI
+	if (ACPI_COMPANION(&client->dev) &&
+	    acpi_bus_set_power(ACPI_HANDLE(&client->dev), ACPI_STATE_D3) == 0)
+		data->acpi_power = true;
+	else
+#endif
+	{
+		data->gpio_power = devm_gpiod_get_optional(dev, "power",
+							   GPIOD_OUT_LOW);
+		if (IS_ERR(data->gpio_power)) {
+			if (PTR_ERR(data->gpio_power) != -EPROBE_DEFER)
+				dev_err(dev, "Power GPIO request failed\n");
+			return PTR_ERR(data->gpio_power);
+		}
 	}
 
 	error = silead_ts_setup(client);
-- 
2.9.3


             reply	other threads:[~2017-01-01 21:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-01 21:30 Hans de Goede [this message]
2017-01-21 17:33 ` [PATCH] Input: silead - Add support for ACPI bus power methods Dmitry Torokhov
2017-01-22 19:54   ` Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170101213004.31050-1-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=onitake@gmail.com \
    --cc=russianneuromancer@ya.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).