Message ID | 1420816989-1808-18-git-send-email-j.anaszewski@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri 2015-01-09 16:23:07, Jacek Anaszewski wrote: > This patch adds a description of 'flashes' property > to the samsung-fimc.txt. > > Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Pawel Moll <pawel.moll@arm.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> > Cc: Kumar Gala <galak@codeaurora.org> Acked-by: Pavel Machek <pavel@ucw.cz>
Hi, On 09/01/15 16:23, Jacek Anaszewski wrote: > This patch adds a description of 'flashes' property > to the samsung-fimc.txt. > > Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > .../devicetree/bindings/media/samsung-fimc.txt | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt > index 922d6f8..22a6b2f 100644 > --- a/Documentation/devicetree/bindings/media/samsung-fimc.txt > +++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt > @@ -40,6 +40,12 @@ should be inactive. For the "active-a" state the camera port A must be activated > and the port B deactivated and for the state "active-b" it should be the other > way around. > > +Optional properties: > + > +- flashes - Array of phandles to flash LED devices, or their sub-nodes > + representing sub-leds. > + (see Documentation/devicetree/bindings/leds/common.txt) How about renaming this to "illuminators" or something else more generic? The "torch" LED (for video recording illumination?) is not really a flash. > + > The 'camera' node must include at least one 'fimc' child node. > > > @@ -166,6 +172,7 @@ Example: > clock-output-names = "cam_a_clkout", "cam_b_clkout"; > pinctrl-names = "default"; > pinctrl-0 = <&cam_port_a_clk_active>; > + flashes = <&camera_flash>, <&system_torch>; > status = "okay"; > #address-cells = <1>; > #size-cells = <1>; -- Thanks, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 01/21/2015 05:32 PM, Sylwester Nawrocki wrote: > Hi, > > On 09/01/15 16:23, Jacek Anaszewski wrote: >> This patch adds a description of 'flashes' property >> to the samsung-fimc.txt. >> >> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > >> --- >> .../devicetree/bindings/media/samsung-fimc.txt | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt >> index 922d6f8..22a6b2f 100644 >> --- a/Documentation/devicetree/bindings/media/samsung-fimc.txt >> +++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt >> @@ -40,6 +40,12 @@ should be inactive. For the "active-a" state the camera port A must be activated >> and the port B deactivated and for the state "active-b" it should be the other >> way around. >> >> +Optional properties: >> + >> +- flashes - Array of phandles to flash LED devices, or their sub-nodes >> + representing sub-leds. >> + (see Documentation/devicetree/bindings/leds/common.txt) > > How about renaming this to "illuminators" or something else more generic? > The "torch" LED (for video recording illumination?) is not really a flash. OK, currently I can't think of a better substitute for 'illuminators'. Since it has been agreed that a discrete LED component requires a child node in a LED device binding, even if there is only one current output exposed by the LED device, this description has to be modified as follows: - illuminators - Array of phandles to the child nodes of a flash LED device related binding. (see Documentation/devicetree/bindings/leds/common.txt).
diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt index 922d6f8..22a6b2f 100644 --- a/Documentation/devicetree/bindings/media/samsung-fimc.txt +++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt @@ -40,6 +40,12 @@ should be inactive. For the "active-a" state the camera port A must be activated and the port B deactivated and for the state "active-b" it should be the other way around. +Optional properties: + +- flashes - Array of phandles to flash LED devices, or their sub-nodes + representing sub-leds. + (see Documentation/devicetree/bindings/leds/common.txt) + The 'camera' node must include at least one 'fimc' child node. @@ -166,6 +172,7 @@ Example: clock-output-names = "cam_a_clkout", "cam_b_clkout"; pinctrl-names = "default"; pinctrl-0 = <&cam_port_a_clk_active>; + flashes = <&camera_flash>, <&system_torch>; status = "okay"; #address-cells = <1>; #size-cells = <1>;