From 2aad5c68470b4e80bcd71484d65a75da5b4a63bc Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Sun, 22 Nov 2009 16:03:25 +0000
Subject: [PATCH] --- yaml --- r: 175267 b: refs/heads/master c:
 dbd5d239e4b24c17ec50bef38aec9bba0e54e1ee h: refs/heads/master i:   175265:
 df13aa40f4653d0a673c784082cbba3462b113c7   175263:
 b670554e99f2e2ac32928eff4a4fb3ee391d5e1d v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/iio/light/Kconfig   |  6 +++---
 trunk/drivers/staging/iio/light/tsl2563.c | 11 ++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6bec54334bdc..57c2cf36e95f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaacdd9b31b9dd6b342b569711b69e47dbba19b2
+refs/heads/master: dbd5d239e4b24c17ec50bef38aec9bba0e54e1ee
diff --git a/trunk/drivers/staging/iio/light/Kconfig b/trunk/drivers/staging/iio/light/Kconfig
index ab541918406b..80cb6e590fbb 100644
--- a/trunk/drivers/staging/iio/light/Kconfig
+++ b/trunk/drivers/staging/iio/light/Kconfig
@@ -4,11 +4,11 @@
 comment "Light sensors"
 
 config SENSORS_TSL2563
-	tristate "TAOS TSL2563 ambient light sensor"
+	tristate "TAOS TSL256[0-3] ambient light sensor"
 	depends on I2C
 	help
-	 If you say yes here you get support for the Taos TSL2563
-	 ambient light sensor (found in N900).
+	 If you say yes here you get support for the Taos TSL2560,
+	 TSL2561, TSL2562 and TSL2563 ambient light sensors.
 
 	 This driver can also be built as a module.  If so, the module
 	 will be called tsl2563.
diff --git a/trunk/drivers/staging/iio/light/tsl2563.c b/trunk/drivers/staging/iio/light/tsl2563.c
index 3e812b2d0cd4..78b9432c8105 100644
--- a/trunk/drivers/staging/iio/light/tsl2563.c
+++ b/trunk/drivers/staging/iio/light/tsl2563.c
@@ -38,8 +38,6 @@
 #include "../iio.h"
 #include "tsl2563.h"
 
-#define DRIVER_NAME  "tsl2563"
-
 /* Use this many bits for fraction part. */
 #define ADC_FRAC_BITS		(14)
 
@@ -738,14 +736,17 @@ static int tsl2563_resume(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tsl2563_id[] = {
-	{ DRIVER_NAME, 0 },
-	{ },
+	{ "tsl2560", 0 },
+	{ "tsl2561", 1 },
+	{ "tsl2562", 2 },
+	{ "tsl2563", 3 },
+	{}
 };
 MODULE_DEVICE_TABLE(i2c, tsl2563_id);
 
 static struct i2c_driver tsl2563_i2c_driver = {
 	.driver = {
-		.name	 = DRIVER_NAME,
+		.name	 = "tsl2563",
 	},
 	.suspend	= tsl2563_suspend,
 	.resume		= tsl2563_resume,