| Message ID | 1480393100-1397-1-git-send-email-tnhuynh@apm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, Nov 29, 2016 at 11:18:20AM +0700, Tin Huynh wrote: > This patch enables ACPI support for leds-pca963x driver. > > Signed-off-by: Tin Huynh <tnhuynh@apm.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tin,
Thanks for the update.
On 11/29/2016 10:15 AM, Mika Westerberg wrote:
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Mika, thanks for the review.
Patch applied to the for-next branch of linux-leds.git.
Hi I got a small bug when compiling without CONFIG_ACPI I will send out the patch to fix the problem later. On Tue, Nov 29, 2016 at 5:04 PM, Jacek Anaszewski <j.anaszewski@samsung.com> wrote: > Hi Tin, > > Thanks for the update. > > On 11/29/2016 10:15 AM, Mika Westerberg wrote: >> >> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > > Mika, thanks for the review. > > Patch applied to the for-next branch of linux-leds.git. > > -- > Best regards, > Jacek Anaszewski
On 11/29/2016 11:09 AM, Tin Huynh wrote: > Hi > I got a small bug when compiling without CONFIG_ACPI > I will send out the patch to fix the problem later. Dropping the patch then. Could you share the details? Thanks, Jacek Anaszewski > On Tue, Nov 29, 2016 at 5:04 PM, Jacek Anaszewski > <j.anaszewski@samsung.com> wrote: >> Hi Tin, >> >> Thanks for the update. >> >> On 11/29/2016 10:15 AM, Mika Westerberg wrote: >>> >>> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> >> >> >> Mika, thanks for the review. >> >> Patch applied to the for-next branch of linux-leds.git. >> >> -- >> Best regards, >> Jacek Anaszewski > > > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index 407eba1..be51a12 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -25,6 +25,7 @@ * or by adding the 'nxp,hw-blink' property to the DTS. */ +#include <linux/acpi.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/string.h> @@ -95,6 +96,15 @@ struct pca963x_chipdef { }; MODULE_DEVICE_TABLE(i2c, pca963x_id); +static const struct acpi_device_id pca963x_acpi_ids[] = { + { "PCA9632", pca9633 }, + { "PCA9633", pca9633 }, + { "PCA9634", pca9634 }, + { "PCA9635", pca9635 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, pca963x_acpi_ids); + struct pca963x_led; struct pca963x { @@ -322,7 +332,16 @@ static int pca963x_probe(struct i2c_client *client, struct pca963x_chipdef *chip; int i, err; - chip = &pca963x_chipdefs[id->driver_data]; + if (id) { + chip = &pca963x_chipdefs[id->driver_data]; + } else { + const struct acpi_device_id *acpi_id; + + acpi_id = acpi_match_device(pca963x_acpi_ids, &client->dev); + if (!acpi_id) + return -ENODEV; + chip = &pca963x_chipdefs[acpi_id->driver_data]; + } pdata = dev_get_platdata(&client->dev); if (!pdata) { @@ -426,6 +445,7 @@ static int pca963x_remove(struct i2c_client *client) .driver = { .name = "leds-pca963x", .of_match_table = of_match_ptr(of_pca963x_match), + .acpi_match_table = ACPI_PTR(pca963x_acpi_ids), }, .probe = pca963x_probe, .remove = pca963x_remove,
This patch enables ACPI support for leds-pca963x driver. Signed-off-by: Tin Huynh <tnhuynh@apm.com> --- drivers/leds/leds-pca963x.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-)