aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-05-09 00:49:37 -0400
committerBryan Wu <cooloney@gmail.com>2013-06-20 19:21:33 -0400
commit28720cff9feeb705a39f54c196bc529fb33d1542 (patch)
treea75b95e461c42c6450444f222d9697cad6ab6165
parent33c88b67f3b66d3a7203862d520b1d07ee0cecb6 (diff)
leds: lp5562: Properly setup of_device_id table
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>
-rw-r--r--drivers/leds/leds-lp5562.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index e53bcb89a978..cbd856dac150 100644
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -587,14 +587,23 @@ static int lp5562_remove(struct i2c_client *client)
587 587
588static const struct i2c_device_id lp5562_id[] = { 588static const struct i2c_device_id lp5562_id[] = {
589 { "lp5562", 0 }, 589 { "lp5562", 0 },
590 { "ti,lp5562", 0 }, /* OF compatible */
591 { } 590 { }
592}; 591};
593MODULE_DEVICE_TABLE(i2c, lp5562_id); 592MODULE_DEVICE_TABLE(i2c, lp5562_id);
594 593
594#ifdef CONFIG_OF
595static const struct of_device_id of_lp5562_leds_match[] = {
596 { .compatible = "ti,lp5562", },
597 {},
598};
599
600MODULE_DEVICE_TABLE(of, of_lp5562_leds_match);
601#endif
602
595static struct i2c_driver lp5562_driver = { 603static struct i2c_driver lp5562_driver = {
596 .driver = { 604 .driver = {
597 .name = "lp5562", 605 .name = "lp5562",
606 .of_match_table = of_match_ptr(of_lp5562_leds_match),
598 }, 607 },
599 .probe = lp5562_probe, 608 .probe = lp5562_probe,
600 .remove = lp5562_remove, 609 .remove = lp5562_remove,