On Mon, Dec 22, 2014 at 3:45 AM, Pavel Machek <pavel@xxxxxx> wrote: > > Addition of a LED Flash class extension entails the need for flash LED > specific device tree properties. The properties being added are: > max-microamp, flash-max-microamp, flash-timeout-microsec. > > Signed-off-by: Pavel Machek <pavel@xxxxxx> > Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > Acked-by: Jacek Anaszewski <j.anaszewski@xxxxxxxxxxx> > Acked-by: Rob Herring <robh@xxxxxxxxxx> > > --- > > This will allow me to add device tree support for adp1653 i2c flash > LED driver, and allow Jacek Anaszewski to add support for more LED > drivers.. > > Rob Herring requested to change microsec to us. > > > diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt > index 2d88816..e9acbbc 100644 > --- a/Documentation/devicetree/bindings/leds/common.txt > +++ b/Documentation/devicetree/bindings/leds/common.txt > @@ -14,6 +14,15 @@ Optional properties for child nodes: > "ide-disk" - LED indicates disk activity > "timer" - LED flashes at a fixed, configurable rate > > +- max-microamp : maximum intensity in microamperes of the LED > + (torch LED for flash devices) > +- flash-max-microamp : maximum intensity in microamperes of the > + flash LED; it is mandatory if the LED should > + support the flash mode > +- flash-timeout-us : timeout in microseconds after which the flash > + LED is turned off > + > + > Examples: > > system-status { > @@ -21,3 +30,10 @@ system-status { > linux,default-trigger = "heartbeat"; > ... > }; > + > +camera-flash { > + label = "Flash"; > + max-microamp = <50000>; > + flash-max-microamp = <320000>; > + flash-timeout-microsec = <500000>; Looks like you forget to update this flash-timeout-microsec to flash-timeout-us? And I think changing -microamp to -uamp is more consistent here. > +} > > > -- > (english) http://www.livejournal.com/~pavelmachek > (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html > -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html