From: Jonathan Cameron <jic23@cam.ac.uk>
To: Greg KH <gregkh@suse.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Amit Kucheria <amit.kucheria@verdurent.com>
Subject: [PATCH 2/2] Staging: IIO: Add tsl2560-2 support to tsl2563 driver.
Date: Sun, 22 Nov 2009 16:03:25 +0000 [thread overview]
Message-ID: <4B0960CD.7020302@cam.ac.uk> (raw)
In-Reply-To: <4B096002.6060702@cam.ac.uk>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
Minimal changes to driver. Just adds the device to the id
table and adjusts the Kconfig elements appropriately.
Adding further similar chips from TAOS is complicated by their
different conversion functions (and hence left for now).
drivers/staging/iio/light/Kconfig | 6 +++---
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 ab54191..80cb6e5 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/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/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index 3e812b2..78b9432 100644
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/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 @@ out:
}
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,
--
1.6.4.4
next prev parent reply other threads:[~2009-11-22 16:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-20 19:12 [PATCH] Staging: IIO: Add tsl2560-2 support to tsl2563 driver + drop tsl2561, driver Jonathan Cameron
2009-11-20 19:17 ` Greg KH
2009-11-22 16:00 ` [PATCH 1/2] Staging: IIO: Remove tsl2561 driver. Support merged with tsl2563 Jonathan Cameron
2009-11-22 16:03 ` Jonathan Cameron [this message]
2009-11-22 19:06 ` [PATCH 2/2] Staging: IIO: Add tsl2560-2 support to tsl2563 driver Amit Kucheria
2009-11-22 19:04 ` [PATCH 1/2] Staging: IIO: Remove tsl2561 driver. Support merged with tsl2563 Amit Kucheria
2009-11-20 20:14 ` [PATCH] Staging: IIO: Add tsl2560-2 support to tsl2563 driver + drop tsl2561, driver Amit Kucheria
2009-11-22 15:45 ` Jonathan Cameron
2009-11-22 19:00 ` Amit Kucheria
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B0960CD.7020302@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=amit.kucheria@verdurent.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox