Skip to content
Snippets Groups Projects
Commit c18016aa authored by Martijn Braam's avatar Martijn Braam Committed by Bart Ribbers
Browse files

Improved STK3310 patch

parent 3c6c3685
Branches
No related tags found
No related merge requests found
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 6e2a169da950..75d146e62bd9 100644
index 6e2a169da950..a25cc35f334e 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -40,6 +40,7 @@
......@@ -10,11 +10,29 @@ index 6e2a169da950..75d146e62bd9 100644
#define STK3310_PSINT_EN 0x01
#define STK3310_PS_MAX_VAL 0xFFFF
@@ -454,6 +455,7 @@ static int stk3310_init(struct iio_dev *indio_dev)
@@ -454,7 +455,8 @@ static int stk3310_init(struct iio_dev *indio_dev)
return ret;
if (chipid != STK3310_CHIP_ID_VAL &&
+ chipid != STK3335_CHIP_ID_VAL &&
chipid != STK3311_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},
{}
};
......@@ -217,7 +217,7 @@
};
stk3335@47 {
compatible = "sensortek,STK3310";
compatible = "sensortek,STK3335";
reg = <0x47>;
interrupt-parent = <&pio>;
interrupts = <1 0 IRQ_TYPE_EDGE_FALLING>; /* PB0 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment