* [PATCH] iio: light: stk3310: Add support for stk3335
@ 2019-06-03 19:20 Luca Weiss
2019-06-08 12:57 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Luca Weiss @ 2019-06-03 19:20 UTC (permalink / raw)
Cc: Martijn Braam, Luca Weiss, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler,
open list:IIO SUBSYSTEM AND DRIVERS, open list
From: Martijn Braam <martijn@brixit.nl>
The stk3335 light/proximity sensor is similar to the stk3310 and stk3311
sensors and works with the stk3310 driver.
Signed-off-by: Martijn Braam <martijn@brixit.nl>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
drivers/iio/light/stk3310.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 6e2a169da950..a25cc35f334e 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -40,6 +40,7 @@
#define STK3310_CHIP_ID_VAL 0x13
#define STK3311_CHIP_ID_VAL 0x1D
+#define STK3335_CHIP_ID_VAL 0x51
#define STK3310_PSINT_EN 0x01
#define STK3310_PS_MAX_VAL 0xFFFF
@@ -454,7 +455,8 @@ static int stk3310_init(struct iio_dev *indio_dev)
return ret;
if (chipid != STK3310_CHIP_ID_VAL &&
- chipid != STK3311_CHIP_ID_VAL) {
+ chipid != STK3311_CHIP_ID_VAL &&
+ chipid != STK3335_CHIP_ID_VAL) {
dev_err(&client->dev, "invalid chip id: 0x%x\n", chipid);
return -ENODEV;
}
@@ -666,6 +668,7 @@ static SIMPLE_DEV_PM_OPS(stk3310_pm_ops, stk3310_suspend, stk3310_resume);
static const struct i2c_device_id stk3310_i2c_id[] = {
{"STK3310", 0},
{"STK3311", 0},
+ {"STK3335", 0},
{}
};
MODULE_DEVICE_TABLE(i2c, stk3310_i2c_id);
@@ -673,6 +676,7 @@ MODULE_DEVICE_TABLE(i2c, stk3310_i2c_id);
static const struct acpi_device_id stk3310_acpi_id[] = {
{"STK3310", 0},
{"STK3311", 0},
+ {"STK3335", 0},
{}
};
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iio: light: stk3310: Add support for stk3335
2019-06-03 19:20 [PATCH] iio: light: stk3310: Add support for stk3335 Luca Weiss
@ 2019-06-08 12:57 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2019-06-08 12:57 UTC (permalink / raw)
To: Luca Weiss
Cc: Martijn Braam, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, open list:IIO SUBSYSTEM AND DRIVERS,
open list
On Mon, 3 Jun 2019 21:20:39 +0200
Luca Weiss <luca@z3ntu.xyz> wrote:
> From: Martijn Braam <martijn@brixit.nl>
>
> The stk3335 light/proximity sensor is similar to the stk3310 and stk3311
> sensors and works with the stk3310 driver.
>
> Signed-off-by: Martijn Braam <martijn@brixit.nl>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to poke at it.
Thanks,
Jonathan
> ---
> drivers/iio/light/stk3310.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
> index 6e2a169da950..a25cc35f334e 100644
> --- a/drivers/iio/light/stk3310.c
> +++ b/drivers/iio/light/stk3310.c
> @@ -40,6 +40,7 @@
>
> #define STK3310_CHIP_ID_VAL 0x13
> #define STK3311_CHIP_ID_VAL 0x1D
> +#define STK3335_CHIP_ID_VAL 0x51
> #define STK3310_PSINT_EN 0x01
> #define STK3310_PS_MAX_VAL 0xFFFF
>
> @@ -454,7 +455,8 @@ static int stk3310_init(struct iio_dev *indio_dev)
> return ret;
>
> if (chipid != STK3310_CHIP_ID_VAL &&
> - chipid != STK3311_CHIP_ID_VAL) {
> + chipid != STK3311_CHIP_ID_VAL &&
> + chipid != STK3335_CHIP_ID_VAL) {
> dev_err(&client->dev, "invalid chip id: 0x%x\n", chipid);
> return -ENODEV;
> }
> @@ -666,6 +668,7 @@ static SIMPLE_DEV_PM_OPS(stk3310_pm_ops, stk3310_suspend, stk3310_resume);
> static const struct i2c_device_id stk3310_i2c_id[] = {
> {"STK3310", 0},
> {"STK3311", 0},
> + {"STK3335", 0},
> {}
> };
> MODULE_DEVICE_TABLE(i2c, stk3310_i2c_id);
> @@ -673,6 +676,7 @@ MODULE_DEVICE_TABLE(i2c, stk3310_i2c_id);
> static const struct acpi_device_id stk3310_acpi_id[] = {
> {"STK3310", 0},
> {"STK3311", 0},
> + {"STK3335", 0},
> {}
> };
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-08 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-03 19:20 [PATCH] iio: light: stk3310: Add support for stk3335 Luca Weiss
2019-06-08 12:57 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).