From: Tin Huynh <[email protected]>
This patch enables ACPI support for leds-pca955x driver.
Signed-off-by: Tin Huynh <[email protected]>
---
drivers/leds/leds-pca955x.c | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 840401a..8770090 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,17 @@ struct pca955x_chipdef {
};
MODULE_DEVICE_TABLE(i2c, pca955x_id);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id pca955x_acpi_ids[] = {
+ { .id = "PCA9550", .driver_data = pca9550 },
+ { .id = "PCA9551", .driver_data = pca9551 },
+ { .id = "PCA9552", .driver_data = pca9552 },
+ { .id = "PCA9553", .driver_data = pca9553 },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids);
+#endif
+
struct pca955x {
struct mutex lock;
struct pca955x_led *leds;
@@ -250,7 +262,18 @@ 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];
+#ifdef CONFIG_ACPI
+ 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];
+ }
+#endif
adapter = to_i2c_adapter(client->dev.parent);
pdata = dev_get_platdata(&client->dev);
@@ -358,6 +381,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
Hi Tin,
Thanks for the patch. While adding ACPI support please
always add ACPI maintainers on CC.
Adding Rafael and Mika.
Thanks,
Jacek Anaszewski
On 11/23/2016 09:42 AM, [email protected] wrote:
> From: Tin Huynh <[email protected]>
>
> This patch enables ACPI support for leds-pca955x driver.
>
> Signed-off-by: Tin Huynh <[email protected]>
> ---
> drivers/leds/leds-pca955x.c | 26 +++++++++++++++++++++++++-
> 1 files changed, 25 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> index 840401a..8770090 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,17 @@ struct pca955x_chipdef {
> };
> MODULE_DEVICE_TABLE(i2c, pca955x_id);
>
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id pca955x_acpi_ids[] = {
> + { .id = "PCA9550", .driver_data = pca9550 },
> + { .id = "PCA9551", .driver_data = pca9551 },
> + { .id = "PCA9552", .driver_data = pca9552 },
> + { .id = "PCA9553", .driver_data = pca9553 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids);
> +#endif
> +
> struct pca955x {
> struct mutex lock;
> struct pca955x_led *leds;
> @@ -250,7 +262,18 @@ 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];
> +#ifdef CONFIG_ACPI
> + 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];
> + }
> +#endif
> adapter = to_i2c_adapter(client->dev.parent);
> pdata = dev_get_platdata(&client->dev);
>
> @@ -358,6 +381,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,
>
--
Best regards,
Jacek Anaszewski
Hi Thang,
It is customary to ack the patches using following tag:
Acked-by: Your Name <your_email>
Thanks,
Jacek Anaszewski
On 11/23/2016 09:44 AM, Thang Q. Nguyen wrote:
> Acked.
>
> On Wed, Nov 23, 2016 at 3:42 PM, <[email protected]
> <mailto:[email protected]>> wrote:
>
> From: Tin Huynh <[email protected] <mailto:[email protected]>>
>
> This patch enables ACPI support for leds-pca955x driver.
>
> Signed-off-by: Tin Huynh <[email protected] <mailto:[email protected]>>
> ---
> drivers/leds/leds-pca955x.c | 26 +++++++++++++++++++++++++-
> 1 files changed, 25 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> index 840401a..8770090 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,17 @@ struct pca955x_chipdef {
> };
> MODULE_DEVICE_TABLE(i2c, pca955x_id);
>
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id pca955x_acpi_ids[] = {
> + { .id = "PCA9550", .driver_data = pca9550 },
> + { .id = "PCA9551", .driver_data = pca9551 },
> + { .id = "PCA9552", .driver_data = pca9552 },
> + { .id = "PCA9553", .driver_data = pca9553 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids);
> +#endif
> +
> struct pca955x {
> struct mutex lock;
> struct pca955x_led *leds;
> @@ -250,7 +262,18 @@ 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];
> +#ifdef CONFIG_ACPI
> + 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];
> + }
> +#endif
> adapter = to_i2c_adapter(client->dev.parent);
> pdata = dev_get_platdata(&client->dev);
>
> @@ -358,6 +381,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
>
>
>
>
> --
>
>
>
> *Thang Q. Nguyen **|**Staff SW Eng.*
>
> C: +849.7684.7606 |O: +848.3770.0640
>
> F: +848.3770.0641 |[email protected] <mailto:[email protected]>
>
On Wed, Nov 23, 2016 at 11:19:21AM +0100, Jacek Anaszewski wrote:
> Hi Tin,
>
> Thanks for the patch. While adding ACPI support please
> always add ACPI maintainers on CC.
>
> Adding Rafael and Mika.
>
> Thanks,
> Jacek Anaszewski
>
> On 11/23/2016 09:42 AM, [email protected] wrote:
> > From: Tin Huynh <[email protected]>
> >
> > This patch enables ACPI support for leds-pca955x driver.
> >
> > Signed-off-by: Tin Huynh <[email protected]>
> > ---
> > drivers/leds/leds-pca955x.c | 26 +++++++++++++++++++++++++-
> > 1 files changed, 25 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> > index 840401a..8770090 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,17 @@ struct pca955x_chipdef {
> > };
> > MODULE_DEVICE_TABLE(i2c, pca955x_id);
> >
> > +#ifdef CONFIG_ACPI
> > +static const struct acpi_device_id pca955x_acpi_ids[] = {
> > + { .id = "PCA9550", .driver_data = pca9550 },
> > + { .id = "PCA9551", .driver_data = pca9551 },
> > + { .id = "PCA9552", .driver_data = pca9552 },
> > + { .id = "PCA9553", .driver_data = pca9553 },
Some like to write this
{ "PCA9553", pca9553 },
instead but both work.
> > + { }
> > +};
> > +MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids);
> > +#endif
> > +
> > struct pca955x {
> > struct mutex lock;
> > struct pca955x_led *leds;
> > @@ -250,7 +262,18 @@ 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];
> > +#ifdef CONFIG_ACPI
You should not need these #ifdefs as acpi_match_device() should be
stubbed out when !CONFIG_ACPI.
Otherwise look good to me.
> > + 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];
> > + }
> > +#endif
> > adapter = to_i2c_adapter(client->dev.parent);
> > pdata = dev_get_platdata(&client->dev);
> >
> > @@ -358,6 +381,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,
> >
>
>
> --
> Best regards,
> Jacek Anaszewski