linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org,
	linux-gpio@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
	Wolfram Sang <wsa@the-dreams.de>,
	Linus Walleij <linus.walleij@linaro.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Mika Westerberg <mika.westerberg@intel.com>,
	"Puustinen, Ismo" <ismo.puustinen@intel.com>,
	"Pandruvada, Srinivas" <srinivas.pandruvada@intel.com>,
	linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 6/8] gpio: pca953x: support ACPI devices found on Galileo Gen2
Date: Tue, 22 Sep 2015 13:10:17 +0300	[thread overview]
Message-ID: <1442916619-140607-7-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1442916619-140607-1-git-send-email-andriy.shevchenko@linux.intel.com>

This patch adds a support of the expandes found on Intel Galileo Gen2 board.
The platform information comes from ACPI.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/gpio/gpio-pca953x.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 242e244..0220b38 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -21,6 +21,7 @@
 #ifdef CONFIG_OF_GPIO
 #include <linux/of_platform.h>
 #endif
+#include <linux/acpi.h>
 
 #define PCA953X_INPUT		0
 #define PCA953X_OUTPUT		1
@@ -75,6 +76,12 @@ static const struct i2c_device_id pca953x_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, pca953x_id);
 
+static const struct acpi_device_id pca953x_acpi_ids[] = {
+	{ "INT3491", 16 | PCA953X_TYPE | PCA_INT, },
+	{ }
+};
+MODULE_DEVICE_TABLE(acpi, pca953x_acpi_ids);
+
 #define MAX_BANK 5
 #define BANK_SZ 8
 
@@ -675,7 +682,18 @@ static int pca953x_probe(struct i2c_client *client,
 
 	chip->client = client;
 
-	chip->driver_data = id->driver_data;
+	if (id) {
+		chip->driver_data = id->driver_data;
+	} else {
+		const struct acpi_device_id *id;
+
+		id = acpi_match_device(pca953x_acpi_ids, &client->dev);
+		if (!id)
+			return -ENODEV;
+
+		chip->driver_data = id->driver_data;
+	}
+
 	chip->chip_type = PCA_CHIP_TYPE(chip->driver_data);
 
 	mutex_init(&chip->i2c_lock);
@@ -768,6 +786,7 @@ static struct i2c_driver pca953x_driver = {
 	.driver = {
 		.name	= "pca953x",
 		.of_match_table = pca953x_dt_ids,
+		.acpi_match_table = ACPI_PTR(pca953x_acpi_ids),
 	},
 	.probe		= pca953x_probe,
 	.remove		= pca953x_remove,
-- 
2.5.1

  parent reply	other threads:[~2015-09-22 10:10 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-22 10:10 [PATCH v1 0/8] enable I2C devices behind I2C bus on Gen2 Andy Shevchenko
2015-09-22 10:10 ` [PATCH v1 1/8] i2c / ACPI: Rework I2C device scanning Andy Shevchenko
2015-09-22 10:10 ` [PATCH v1 2/8] mfd: core: redo ACPI matching of the children devices Andy Shevchenko
2015-09-22 22:15   ` Lee Jones
2015-09-23 11:06     ` Andy Shevchenko
2015-09-22 10:10 ` [PATCH v1 3/8] mfd: intel_quark_i2c_gpio: load gpio driver first Andy Shevchenko
2015-09-22 22:23   ` Lee Jones
2015-09-23  7:53     ` Andy Shevchenko
2015-09-24 17:29   ` Lee Jones
2015-09-22 10:10 ` [PATCH v1 4/8] mfd: intel_quark_i2c_gpio: support devices behind i2c bus Andy Shevchenko
2015-09-22 22:25   ` Lee Jones
2015-09-22 10:10 ` [PATCH v1 5/8] gpio: pca953x: store driver_data for future use Andy Shevchenko
2015-10-02 10:53   ` Linus Walleij
2015-10-02 12:16     ` Andy Shevchenko
2015-09-22 10:10 ` Andy Shevchenko [this message]
2015-10-02 10:54   ` [PATCH v1 6/8] gpio: pca953x: support ACPI devices found on Galileo Gen2 Linus Walleij
2015-09-22 10:10 ` [PATCH v1 7/8] at24: enable ACPI device " Andy Shevchenko
2015-09-22 10:10 ` [PATCH v1 8/8] pwm-pca9685: " Andy Shevchenko
2015-09-22 14:37   ` Thierry Reding
2015-09-23  8:41     ` Andy Shevchenko
2015-09-23 12:48       ` Thierry Reding
2015-09-23 12:56         ` Andy Shevchenko

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=1442916619-140607-7-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=ismo.puustinen@intel.com \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=srinivas.pandruvada@intel.com \
    --cc=wsa@the-dreams.de \
    /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).