On Wed, Feb 20, 2013 at 12:36 AM, Kim, Milo <Milo.Kim@xxxxxx> wrote: > LM355x and LM3642 support flash and torch functionality. > > (Camera driver) (LED trigger for camera) (LED driver) > Turn on the flash ...> ledtrig_flash_ctrl(true) ...> LM355x or LM3642 > brightness ctrl > <actual driving here> > > Flash/torch LEDs are controlled by other driver using LED camera trigger > APIs, ledtrig_flash_ctrl()/ledtrig_torch_ctrl(). > Then, actual device control is activated by each LED driver such like > LM355x or LM3642. > Looks good to me, I will merge this after you update PATCH 2/3. Thanks, -Bryan > Signed-off-by: Milo(Woogyom) Kim <milo.kim@xxxxxx> > --- > drivers/leds/leds-lm355x.c | 2 ++ > drivers/leds/leds-lm3642.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c > index 4117235..d81a8e7 100644 > --- a/drivers/leds/leds-lm355x.c > +++ b/drivers/leds/leds-lm355x.c > @@ -477,6 +477,7 @@ static int lm355x_probe(struct i2c_client *client, > chip->cdev_flash.name = "flash"; > chip->cdev_flash.max_brightness = 16; > chip->cdev_flash.brightness_set = lm355x_strobe_brightness_set; > + chip->cdev_flash.default_trigger = "flash"; > err = led_classdev_register((struct device *) > &client->dev, &chip->cdev_flash); > if (err < 0) > @@ -486,6 +487,7 @@ static int lm355x_probe(struct i2c_client *client, > chip->cdev_torch.name = "torch"; > chip->cdev_torch.max_brightness = 8; > chip->cdev_torch.brightness_set = lm355x_torch_brightness_set; > + chip->cdev_torch.default_trigger = "torch"; > err = led_classdev_register((struct device *) > &client->dev, &chip->cdev_torch); > if (err < 0) > diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c > index 9f428d9..f361bbe 100644 > --- a/drivers/leds/leds-lm3642.c > +++ b/drivers/leds/leds-lm3642.c > @@ -363,6 +363,7 @@ static int lm3642_probe(struct i2c_client *client, > chip->cdev_flash.name = "flash"; > chip->cdev_flash.max_brightness = 16; > chip->cdev_flash.brightness_set = lm3642_strobe_brightness_set; > + chip->cdev_flash.default_trigger = "flash"; > err = led_classdev_register((struct device *) > &client->dev, &chip->cdev_flash); > if (err < 0) { > @@ -380,6 +381,7 @@ static int lm3642_probe(struct i2c_client *client, > chip->cdev_torch.name = "torch"; > chip->cdev_torch.max_brightness = 8; > chip->cdev_torch.brightness_set = lm3642_torch_brightness_set; > + chip->cdev_torch.default_trigger = "torch"; > err = led_classdev_register((struct device *) > &client->dev, &chip->cdev_torch); > if (err < 0) { > -- > 1.7.9.5 > > > Best Regards, > Milo > > -- 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