leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: pca953x: support ACPI devices found on Galileo Gen2

Browse Source 
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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2015-10-01 14:20:28 +03:00 committed by Linus Walleij
parent c6664149af
commit f32517bf1a
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpio/gpio-pca953x.c
View File

@ -21,6 +21,7 @@
#ifdef CONFIG_OF_GPIO #ifdef CONFIG_OF_GPIO
#include <linux/of_platform.h> #include <linux/of_platform.h>
#endif #endif
#include <linux/acpi.h>
#define PCA953X_INPUT 0 #define PCA953X_INPUT 0
#define PCA953X_OUTPUT 1 #define PCA953X_OUTPUT 1
@ -76,6 +77,12 @@ static const struct i2c_device_id pca953x_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, 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 MAX_BANK 5
#define BANK_SZ 8 #define BANK_SZ 8
@ -680,7 +687,18 @@ static int pca953x_probe(struct i2c_client *client,
chip->client = client; chip->client = client;
if (id) {
chip->driver_data = id->driver_data; 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); chip->chip_type = PCA_CHIP_TYPE(chip->driver_data);
mutex_init(&chip->i2c_lock); mutex_init(&chip->i2c_lock);
@ -773,6 +791,7 @@ static struct i2c_driver pca953x_driver = {
.driver = { .driver = {
.name = "pca953x", .name = "pca953x",
.of_match_table = pca953x_dt_ids, .of_match_table = pca953x_dt_ids,
.acpi_match_table = ACPI_PTR(pca953x_acpi_ids),
}, },
.probe = pca953x_probe, .probe = pca953x_probe,
.remove = pca953x_remove, .remove = pca953x_remove,