From e59e3b2ee7fbf74f69be39b234e7ea64b94ef0b5 Mon Sep 17 00:00:00 2001
From: "Kim, Milo" <Milo.Kim@ti.com>
Date: Tue, 4 Sep 2012 15:06:18 +0800
Subject: [PATCH] --- yaml --- r: 333075 b: refs/heads/master c:
 27d7704e5ebf0bc0cba86508023dd484639a48de h: refs/heads/master i:   333073:
 22efa2e170b939907271dba099139ee9ab07e2c4   333071:
 8de708cb9c31f3830ec0d851c330751f63757795 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/leds/leds-lp5523.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a9b452b65b6f..b0ec80db8b21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca7053216833d6b9cd3faaa0dfd2261ce3b9dffc
+refs/heads/master: 27d7704e5ebf0bc0cba86508023dd484639a48de
diff --git a/trunk/drivers/leds/leds-lp5523.c b/trunk/drivers/leds/leds-lp5523.c
index 80d37929044f..e69e72a11a97 100644
--- a/trunk/drivers/leds/leds-lp5523.c
+++ b/trunk/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,