diff mbox series

iio:light:apds9960 add detection for MSHW0184 ACPI device in apds9960 driver

Message ID 20201220015057.107246-1-maxwell.leiter@gmail.com (mailing list archive)
State New, archived
Headers show
Series iio:light:apds9960 add detection for MSHW0184 ACPI device in apds9960 driver | expand

Commit Message

Max Leiter Dec. 20, 2020, 1:50 a.m. UTC
The device is used in the Microsoft Surface Book 3 and Surface Pro 7

Signed-off-by: Max Leiter <maxwell.leiter@gmail.com>
---
 drivers/iio/light/apds9960.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Matt Ranostay Dec. 20, 2020, 10:05 p.m. UTC | #1
On Sat, Dec 19, 2020 at 5:51 PM Max Leiter <maxwell.leiter@gmail.com> wrote:
>
> The device is used in the Microsoft Surface Book 3 and Surface Pro 7
>
> Signed-off-by: Max Leiter <maxwell.leiter@gmail.com>

Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>

> ---
>  drivers/iio/light/apds9960.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
> index 9afb3fcc74e6..20719141c03a 100644
> --- a/drivers/iio/light/apds9960.c
> +++ b/drivers/iio/light/apds9960.c
> @@ -8,6 +8,7 @@
>   * TODO: gesture + proximity calib offsets
>   */
>
> +#include <linux/acpi.h>
>  #include <linux/module.h>
>  #include <linux/init.h>
>  #include <linux/interrupt.h>
> @@ -1113,6 +1114,12 @@ static const struct i2c_device_id apds9960_id[] = {
>  };
>  MODULE_DEVICE_TABLE(i2c, apds9960_id);
>
> +static const struct acpi_device_id apds9960_acpi_match[] = {
> +       { "MSHW0184" },
> +       { }
> +};
> +MODULE_DEVICE_TABLE(acpi, apds9960_acpi_match);
> +
>  static const struct of_device_id apds9960_of_match[] = {
>         { .compatible = "avago,apds9960" },
>         { }
> @@ -1124,6 +1131,7 @@ static struct i2c_driver apds9960_driver = {
>                 .name   = APDS9960_DRV_NAME,
>                 .of_match_table = apds9960_of_match,
>                 .pm     = &apds9960_pm_ops,
> +               .acpi_match_table = apds9960_acpi_match,
>         },
>         .probe          = apds9960_probe,
>         .remove         = apds9960_remove,
> --
> 2.29.2
>
Jonathan Cameron Dec. 21, 2020, 2:42 p.m. UTC | #2
On Sun, 20 Dec 2020 14:05:17 -0800
Matt Ranostay <matt.ranostay@konsulko.com> wrote:

> On Sat, Dec 19, 2020 at 5:51 PM Max Leiter <maxwell.leiter@gmail.com> wrote:
> >
> > The device is used in the Microsoft Surface Book 3 and Surface Pro 7
> >
> > Signed-off-by: Max Leiter <maxwell.leiter@gmail.com>  
> 
> Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to see if we missed anything.

Thanks,

Jonathan

> 
> > ---
> >  drivers/iio/light/apds9960.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
> > index 9afb3fcc74e6..20719141c03a 100644
> > --- a/drivers/iio/light/apds9960.c
> > +++ b/drivers/iio/light/apds9960.c
> > @@ -8,6 +8,7 @@
> >   * TODO: gesture + proximity calib offsets
> >   */
> >
> > +#include <linux/acpi.h>
> >  #include <linux/module.h>
> >  #include <linux/init.h>
> >  #include <linux/interrupt.h>
> > @@ -1113,6 +1114,12 @@ static const struct i2c_device_id apds9960_id[] = {
> >  };
> >  MODULE_DEVICE_TABLE(i2c, apds9960_id);
> >
> > +static const struct acpi_device_id apds9960_acpi_match[] = {
> > +       { "MSHW0184" },
> > +       { }
> > +};
> > +MODULE_DEVICE_TABLE(acpi, apds9960_acpi_match);
> > +
> >  static const struct of_device_id apds9960_of_match[] = {
> >         { .compatible = "avago,apds9960" },
> >         { }
> > @@ -1124,6 +1131,7 @@ static struct i2c_driver apds9960_driver = {
> >                 .name   = APDS9960_DRV_NAME,
> >                 .of_match_table = apds9960_of_match,
> >                 .pm     = &apds9960_pm_ops,
> > +               .acpi_match_table = apds9960_acpi_match,
> >         },
> >         .probe          = apds9960_probe,
> >         .remove         = apds9960_remove,
> > --
> > 2.29.2
> >
diff mbox series

Patch

diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
index 9afb3fcc74e6..20719141c03a 100644
--- a/drivers/iio/light/apds9960.c
+++ b/drivers/iio/light/apds9960.c
@@ -8,6 +8,7 @@ 
  * TODO: gesture + proximity calib offsets
  */
 
+#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -1113,6 +1114,12 @@  static const struct i2c_device_id apds9960_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, apds9960_id);
 
+static const struct acpi_device_id apds9960_acpi_match[] = {
+	{ "MSHW0184" },
+	{ }
+};
+MODULE_DEVICE_TABLE(acpi, apds9960_acpi_match);
+
 static const struct of_device_id apds9960_of_match[] = {
 	{ .compatible = "avago,apds9960" },
 	{ }
@@ -1124,6 +1131,7 @@  static struct i2c_driver apds9960_driver = {
 		.name	= APDS9960_DRV_NAME,
 		.of_match_table = apds9960_of_match,
 		.pm	= &apds9960_pm_ops,
+		.acpi_match_table = apds9960_acpi_match,
 	},
 	.probe		= apds9960_probe,
 	.remove		= apds9960_remove,