2020-12-20 01:54:19

by Max Leiter

Subject: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in apds9960 driver

The device is used in the Microsoft Surface Book 3 and Surface Pro 7

Signed-off-by: Max Leiter <[email protected]>
---
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

2020-12-21 04:53:47

by Matt Ranostay

Subject: Re: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in apds9960 driver

On Sat, Dec 19, 2020 at 5:51 PM Max Leiter <[email protected]> wrote:
>
> The device is used in the Microsoft Surface Book 3 and Surface Pro 7
>
> Signed-off-by: Max Leiter <[email protected]>

Reviewed-by: Matt Ranostay <[email protected]>

> ---
> 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
>

2020-12-21 14:45:55

by Jonathan Cameron

Subject: Re: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in apds9960 driver

On Sun, 20 Dec 2020 14:05:17 -0800
Matt Ranostay <[email protected]> wrote:

> On Sat, Dec 19, 2020 at 5:51 PM Max Leiter <[email protected]> wrote:
> >
> > The device is used in the Microsoft Surface Book 3 and Surface Pro 7
> >
> > Signed-off-by: Max Leiter <[email protected]>
>
> Reviewed-by: Matt Ranostay <[email protected]>
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
> >