2016-11-30 09:48:43

by Tin Huynh

Subject: [PATCH V4] leds: pca955x: Add ACPI support for pca955x

This patch enables ACPI support for leds-pca955x driver.

Signed-off-by: Tin Huynh <[email protected]>
---
drivers/leds/leds-pca955x.c | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)

Change from V3:
-Drop ".id =" and ".driver_data =" from pca955x_acpi_ids initializers.

Change from V2:
-Correct coding conventions.

Change from V1:
-Remove CONFIG_ACPI.

diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 840401a..e29151c 100644
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -40,6 +40,7 @@
* bits the chip supports.
*/

+#include <linux/acpi.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/string.h>
@@ -100,6 +101,15 @@ struct pca955x_chipdef {
};
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 mutex lock;
struct pca955x_led *leds;
@@ -250,7 +260,16 @@ static int pca955x_probe(struct i2c_client *client,
struct led_platform_data *pdata;
int i, err;

- chip = &pca955x_chipdefs[id->driver_data];
+ if (id) {
+ 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);
pdata = dev_get_platdata(&client->dev);

@@ -358,6 +377,7 @@ static int pca955x_remove(struct i2c_client *client)
static struct i2c_driver pca955x_driver = {
.driver = {
.name = "leds-pca955x",
+ .acpi_match_table = ACPI_PTR(pca955x_acpi_ids),
},
.probe = pca955x_probe,
.remove = pca955x_remove,
--
1.7.1

2016-11-30 10:03:00

by Mika Westerberg

Subject: Re: [PATCH V4] leds: pca955x: Add ACPI support for pca955x

On Wed, Nov 30, 2016 at 04:47:25PM +0700, Tin Huynh wrote:
> This patch enables ACPI support for leds-pca955x driver.
>
> Signed-off-by: Tin Huynh <[email protected]>

Looks good to me now,

Acked-by: Mika Westerberg <[email protected]>

2016-11-30 10:23:40

by Jacek Anaszewski

Subject: Re: [PATCH V4] leds: pca955x: Add ACPI support for pca955x

Hi Tin,

Thanks for the patch.

On 11/30/2016 11:00 AM, Mika Westerberg wrote:
> On Wed, Nov 30, 2016 at 04:47:25PM +0700, Tin Huynh wrote:
>> This patch enables ACPI support for leds-pca955x driver.
>>
>> Signed-off-by: Tin Huynh <[email protected]>
>
> Looks good to me now,
>
> Acked-by: Mika Westerberg <[email protected]>

Thanks for the review, Mika.

Patch applied to the for-next branch of linux-leds.git.

--
Best regards,
Jacek Anaszewski