]> git.karo-electronics.de Git - linux-beck.git/commitdiff
leds: lp5523: Properly setup of_device_id table
authorAxel Lin <axel.lin@ingics.com>
Thu, 9 May 2013 04:48:57 +0000 (21:48 -0700)
committerBryan Wu <cooloney@gmail.com>
Thu, 20 Jun 2013 23:21:33 +0000 (16:21 -0700)
Don't mix of_device_id entry in i2c_device_id table.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
drivers/leds/leds-lp5523.c

index 365e9148e5e8fefd28499c3117a3ead57ee5ed90..3979428f3100ab9d274a5e3bb3afa1333399efee 100644 (file)
@@ -503,15 +503,24 @@ static int lp5523_remove(struct i2c_client *client)
 static const struct i2c_device_id lp5523_id[] = {
        { "lp5523",  LP5523 },
        { "lp55231", LP55231 },
-       { "national,lp5523", 0 }, /* OF compatible */
        { }
 };
 
 MODULE_DEVICE_TABLE(i2c, lp5523_id);
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_lp5523_leds_match[] = {
+       { .compatible = "national,lp5523", },
+       {},
+};
+
+MODULE_DEVICE_TABLE(of, of_lp5523_leds_match);
+#endif
+
 static struct i2c_driver lp5523_driver = {
        .driver = {
                .name   = "lp5523x",
+               .of_match_table = of_match_ptr(of_lp5523_leds_match),
        },
        .probe          = lp5523_probe,
        .remove         = lp5523_remove,