On Mon, Nov 12, 2012 at 1:25 PM, Marek Belisko <marek.beli...@open-nandra.com> wrote: > Support added only for leds (not for gpio's). > > Signed-off-by: Marek Belisko <marek.beli...@open-nandra.com> > --- > > Changes from v2: > - change compatible property to "ti,tca6507" > - add documentation for linux,default-trigger > > Changes from v1: > - return proper error value not NULL from tca6507_led_dt_init() > - remove empty lines > - remove kfree() > > drivers/leds/leds-tca6507.c | 70 > +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 67 insertions(+), 3 deletions(-) > > diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c > index dabcf7a..fdc1ea6 100644 > --- a/drivers/leds/leds-tca6507.c > +++ b/drivers/leds/leds-tca6507.c > @@ -667,6 +667,66 @@ static void tca6507_remove_gpio(struct tca6507_chip *tca) > } > #endif /* CONFIG_GPIOLIB */ > > +#ifdef CONFIG_OF > +static struct tca6507_platform_data * __devinit tca6507_led_dt_init(struct > i2c_client *client) > +{ > + struct device_node *np = client->dev.of_node, *child; > + struct tca6507_platform_data *pdata; > + struct led_info *tca_leds; > + int count = 0; > + > + for_each_child_of_node(np, child) > + count++; > + if (!count) > + return ERR_PTR(-ENODEV); > + > + if (count > NUM_LEDS) > + return ERR_PTR(-ENODEV); > + > + tca_leds = devm_kzalloc(&client->dev, sizeof(struct led_info) * > NUM_LEDS, GFP_KERNEL);
I guess it should be 'sizeof(struct led_info) * count' instead of 'sizeof(struct led_info) * NUM_LEDS' > + if (!tca_leds) > + return ERR_PTR(-ENOMEM); > + > + for_each_child_of_node(np, child) { > + struct led_info led; > + u32 reg; > + int ret; > + > + led.name = of_get_property(child, "label", NULL) ? : > child->name; > + led.default_trigger = > + of_get_property(child, "linux,default-trigger", NULL); > + > + ret = of_property_read_u32(child, "reg", ®); > + one more empty line > + if (ret != 0) > + continue; you can put one empty line here, > + tca_leds[reg] = led; > + } > + pdata = devm_kzalloc(&client->dev, sizeof(struct > tca6507_platform_data), GFP_KERNEL); > + if (!pdata) { no need {} here for just one line of this scope. > + return ERR_PTR(-ENOMEM); > + } remove this. > + > + pdata->leds.leds = tca_leds; > + pdata->leds.num_leds = NUM_LEDS; I think it should '= count' instead of '= NUM_LEDS'. > + > + return pdata; > +} > + > +static const struct of_device_id of_tca6507_leds_match[] = { > + { .compatible = "ti,tca6507", }, > + {}, > +}; > + > +#else > +static int __devinit tca6507_led_dt_init(struct i2c_client *client, struct > tca6507_platform_data *data) > +{ > + return -1; > +} > + > +#define of_tca6507_leds_match NULL > +#endif > + > static int __devinit tca6507_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > @@ -683,9 +743,12 @@ static int __devinit tca6507_probe(struct i2c_client > *client, > return -EIO; > > if (!pdata || pdata->leds.num_leds != NUM_LEDS) { > - dev_err(&client->dev, "Need %d entries in platform-data > list\n", > - NUM_LEDS); > - return -ENODEV; > + pdata = tca6507_led_dt_init(client); > + if (IS_ERR(pdata)) { > + dev_err(&client->dev, "Need %d entries in > platform-data list\n", > + NUM_LEDS); > + return PTR_ERR(pdata); > + } > } > tca = devm_kzalloc(&client->dev, sizeof(*tca), GFP_KERNEL); > if (!tca) > @@ -750,6 +813,7 @@ static struct i2c_driver tca6507_driver = { > .driver = { > .name = "leds-tca6507", > .owner = THIS_MODULE, > + .of_match_table = of_tca6507_leds_match, > }, > .probe = tca6507_probe, > .remove = __devexit_p(tca6507_remove), > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/