linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/3] leds-lp5523: add new device id for LP55231
@ 2012-09-04  7:06 Kim, Milo
  2012-09-04  8:10 ` Bryan Wu
  0 siblings, 1 reply; 2+ messages in thread
From: Kim, Milo @ 2012-09-04  7:06 UTC (permalink / raw)
  To: Bryan Wu; +Cc: linux-leds, linux-kernel, Richard Purdie

 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>
---
 drivers/leds/leds-lp5523.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 80d3792..e69e72a 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,
-- 
1.7.9.5


Best Regards,
Milo



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2/3] leds-lp5523: add new device id for LP55231
  2012-09-04  7:06 [PATCH 2/3] leds-lp5523: add new device id for LP55231 Kim, Milo
@ 2012-09-04  8:10 ` Bryan Wu
  0 siblings, 0 replies; 2+ messages in thread
From: Bryan Wu @ 2012-09-04  8:10 UTC (permalink / raw)
  To: Kim, Milo; +Cc: linux-leds, linux-kernel, Richard Purdie

On Tue, Sep 4, 2012 at 3:06 PM, Kim, Milo <Milo.Kim@ti.com> wrote:
>  To support LP55231 device, the device id is added.
>  Additionally, the i2c driver name is changed from lp5523 to lp5523x.
>

Applied to my for-next.

-Bryan

> Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
> ---
>  drivers/leds/leds-lp5523.c |   10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
> index 80d3792..e69e72a 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,
> --
> 1.7.9.5
>
>
> Best Regards,
> Milo
>
>



-- 
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer    +86.186-168-78255 Mobile
Canonical Ltd.      www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-04  8:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04  7:06 [PATCH 2/3] leds-lp5523: add new device id for LP55231 Kim, Milo
2012-09-04  8:10 ` Bryan Wu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).