Commit 44b3e31d authored by Tin Huynh's avatar Tin Huynh Committed by Jacek Anaszewski

leds: pca955x: Add ACPI support

This patch enables ACPI support for leds-pca955x driver.
Signed-off-by: default avatarTin Huynh <tnhuynh@apm.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 825fe38a
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
* bits the chip supports. * bits the chip supports.
*/ */
#include <linux/acpi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -100,6 +101,15 @@ static const struct i2c_device_id pca955x_id[] = { ...@@ -100,6 +101,15 @@ static const struct i2c_device_id pca955x_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, pca955x_id); MODULE_DEVICE_TABLE(i2c, pca955x_id);
static const struct acpi_device_id pca955x_acpi_ids[] = {
{ "PCA9550", pca9550 },
{ "PCA9551", pca9551 },
{ "PCA9552", pca9552 },
{ "PCA9553", pca9553 },
{ }
};
MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids);
struct pca955x { struct pca955x {
struct mutex lock; struct mutex lock;
struct pca955x_led *leds; struct pca955x_led *leds;
...@@ -250,7 +260,16 @@ static int pca955x_probe(struct i2c_client *client, ...@@ -250,7 +260,16 @@ static int pca955x_probe(struct i2c_client *client,
struct led_platform_data *pdata; struct led_platform_data *pdata;
int i, err; int i, err;
if (id) {
chip = &pca955x_chipdefs[id->driver_data]; chip = &pca955x_chipdefs[id->driver_data];
} else {
const struct acpi_device_id *acpi_id;
acpi_id = acpi_match_device(pca955x_acpi_ids, &client->dev);
if (!acpi_id)
return -ENODEV;
chip = &pca955x_chipdefs[acpi_id->driver_data];
}
adapter = to_i2c_adapter(client->dev.parent); adapter = to_i2c_adapter(client->dev.parent);
pdata = dev_get_platdata(&client->dev); pdata = dev_get_platdata(&client->dev);
...@@ -264,7 +283,7 @@ static int pca955x_probe(struct i2c_client *client, ...@@ -264,7 +283,7 @@ static int pca955x_probe(struct i2c_client *client,
dev_info(&client->dev, "leds-pca955x: Using %s %d-bit LED driver at " dev_info(&client->dev, "leds-pca955x: Using %s %d-bit LED driver at "
"slave address 0x%02x\n", "slave address 0x%02x\n",
id->name, chip->bits, client->addr); client->name, chip->bits, client->addr);
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
return -EIO; return -EIO;
...@@ -358,6 +377,7 @@ static int pca955x_remove(struct i2c_client *client) ...@@ -358,6 +377,7 @@ static int pca955x_remove(struct i2c_client *client)
static struct i2c_driver pca955x_driver = { static struct i2c_driver pca955x_driver = {
.driver = { .driver = {
.name = "leds-pca955x", .name = "leds-pca955x",
.acpi_match_table = ACPI_PTR(pca955x_acpi_ids),
}, },
.probe = pca955x_probe, .probe = pca955x_probe,
.remove = pca955x_remove, .remove = pca955x_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment