summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2012-09-04 15:06:18 +0800
committerBryan Wu <bryan.wu@canonical.com>2012-09-11 18:32:42 +0800
commit27d7704e5ebf0bc0cba86508023dd484639a48de (patch)
tree6a85b7552157f9231b958739cd0c47b702425627 /drivers/leds
parentca7053216833d6b9cd3faaa0dfd2261ce3b9dffc (diff)
downloadlinux-3.10-27d7704e5ebf0bc0cba86508023dd484639a48de.tar.gz
linux-3.10-27d7704e5ebf0bc0cba86508023dd484639a48de.tar.bz2
linux-3.10-27d7704e5ebf0bc0cba86508023dd484639a48de.zip
leds-lp5523: add new device id for LP55231
To support LP55231 device, the device id is added. Additionally, the i2c driver name is changed from lp5523 to lp5523x. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-lp5523.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 80d37929044..e69e72a11a9 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -104,6 +104,11 @@
#define LED_ACTIVE(mux, led) (!!(mux & (0x0001 << led)))
#define SHIFT_MASK(id) (((id) - 1) * 2)
+enum lp5523_chip_id {
+ LP5523,
+ LP55231,
+};
+
struct lp5523_engine {
int id;
u8 mode;
@@ -1005,7 +1010,8 @@ static int lp5523_remove(struct i2c_client *client)
}
static const struct i2c_device_id lp5523_id[] = {
- { "lp5523", 0 },
+ { "lp5523", LP5523 },
+ { "lp55231", LP55231 },
{ }
};
@@ -1013,7 +1019,7 @@ MODULE_DEVICE_TABLE(i2c, lp5523_id);
static struct i2c_driver lp5523_driver = {
.driver = {
- .name = "lp5523",
+ .name = "lp5523x",
},
.probe = lp5523_probe,
.remove = lp5523_remove,