From: Axel Lin Date: Thu, 9 May 2013 04:49:37 +0000 (-0700) Subject: leds: lp5562: Properly setup of_device_id table X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=28720cff9feeb705a39f54c196bc529fb33d1542;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Linus Walleij Signed-off-by: Bryan Wu --- 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) static const struct i2c_device_id lp5562_id[] = { { "lp5562", 0 }, - { "ti,lp5562", 0 }, /* OF compatible */ { } }; MODULE_DEVICE_TABLE(i2c, lp5562_id); +#ifdef CONFIG_OF +static const struct of_device_id of_lp5562_leds_match[] = { + { .compatible = "ti,lp5562", }, + {}, +}; + +MODULE_DEVICE_TABLE(of, of_lp5562_leds_match); +#endif + static struct i2c_driver lp5562_driver = { .driver = { .name = "lp5562", + .of_match_table = of_match_ptr(of_lp5562_leds_match), }, .probe = lp5562_probe, .remove = lp5562_remove,