On Tue, Sep 4, 2012 at 3:06 PM, Kim, Milo <Milo.Kim@xxxxxx> 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@xxxxxx>
> ---
> 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@xxxxxxxxxxxxx>
Kernel Developer +86.186-168-78255 Mobile
Canonical Ltd. www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
