diff options
| -rw-r--r-- | drivers/staging/iio/light/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/staging/iio/light/tsl2563.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig index ab541918406b..80cb6e590fbb 100644 --- a/drivers/staging/iio/light/Kconfig +++ b/drivers/staging/iio/light/Kconfig | |||
| @@ -4,11 +4,11 @@ | |||
| 4 | comment "Light sensors" | 4 | comment "Light sensors" |
| 5 | 5 | ||
| 6 | config SENSORS_TSL2563 | 6 | config SENSORS_TSL2563 |
| 7 | tristate "TAOS TSL2563 ambient light sensor" | 7 | tristate "TAOS TSL256[0-3] ambient light sensor" |
| 8 | depends on I2C | 8 | depends on I2C |
| 9 | help | 9 | help |
| 10 | If you say yes here you get support for the Taos TSL2563 | 10 | If you say yes here you get support for the Taos TSL2560, |
| 11 | ambient light sensor (found in N900). | 11 | TSL2561, TSL2562 and TSL2563 ambient light sensors. |
| 12 | 12 | ||
| 13 | This driver can also be built as a module. If so, the module | 13 | This driver can also be built as a module. If so, the module |
| 14 | will be called tsl2563. | 14 | will be called tsl2563. |
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c index 3e812b2d0cd4..78b9432c8105 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/staging/iio/light/tsl2563.c | |||
| @@ -38,8 +38,6 @@ | |||
| 38 | #include "../iio.h" | 38 | #include "../iio.h" |
| 39 | #include "tsl2563.h" | 39 | #include "tsl2563.h" |
| 40 | 40 | ||
| 41 | #define DRIVER_NAME "tsl2563" | ||
| 42 | |||
| 43 | /* Use this many bits for fraction part. */ | 41 | /* Use this many bits for fraction part. */ |
| 44 | #define ADC_FRAC_BITS (14) | 42 | #define ADC_FRAC_BITS (14) |
| 45 | 43 | ||
| @@ -738,14 +736,17 @@ out: | |||
| 738 | } | 736 | } |
| 739 | 737 | ||
| 740 | static const struct i2c_device_id tsl2563_id[] = { | 738 | static const struct i2c_device_id tsl2563_id[] = { |
| 741 | { DRIVER_NAME, 0 }, | 739 | { "tsl2560", 0 }, |
| 742 | { }, | 740 | { "tsl2561", 1 }, |
| 741 | { "tsl2562", 2 }, | ||
| 742 | { "tsl2563", 3 }, | ||
| 743 | {} | ||
| 743 | }; | 744 | }; |
| 744 | MODULE_DEVICE_TABLE(i2c, tsl2563_id); | 745 | MODULE_DEVICE_TABLE(i2c, tsl2563_id); |
| 745 | 746 | ||
| 746 | static struct i2c_driver tsl2563_i2c_driver = { | 747 | static struct i2c_driver tsl2563_i2c_driver = { |
| 747 | .driver = { | 748 | .driver = { |
| 748 | .name = DRIVER_NAME, | 749 | .name = "tsl2563", |
| 749 | }, | 750 | }, |
| 750 | .suspend = tsl2563_suspend, | 751 | .suspend = tsl2563_suspend, |
| 751 | .resume = tsl2563_resume, | 752 | .resume = tsl2563_resume, |
