* [PATCH v10 4/8] DT: aat1290: Document handling external strobe sources [not found] <1433754145-12765-1-git-send-email-j.anaszewski@samsung.com> @ 2015-06-08 9:02 ` Jacek Anaszewski 2015-06-10 18:12 ` Bryan Wu 2015-06-08 9:02 ` [PATCH v10 7/8] DT: Add documentation for exynos4-is 'flashes' property Jacek Anaszewski 1 sibling, 1 reply; 4+ messages in thread From: Jacek Anaszewski @ 2015-06-08 9:02 UTC (permalink / raw) To: linux-leds, linux-media Cc: kyungmin.park, pavel, cooloney, rpurdie, sakari.ailus, s.nawrocki, Jacek Anaszewski, devicetree This patch adds documentation for a pinctrl-names property. The property, when present, is used for switching the source of the strobe signal for the device. Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Bryan Wu <cooloney@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Sakari Ailus <sakari.ailus@iki.fi> Cc: devicetree@vger.kernel.org --- .../devicetree/bindings/leds/leds-aat1290.txt | 36 ++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/leds/leds-aat1290.txt b/Documentation/devicetree/bindings/leds/leds-aat1290.txt index ef88b9c..c05ed91 100644 --- a/Documentation/devicetree/bindings/leds/leds-aat1290.txt +++ b/Documentation/devicetree/bindings/leds/leds-aat1290.txt @@ -2,7 +2,9 @@ The device is controlled through two pins: FL_EN and EN_SET. The pins when, asserted high, enable flash strobe and movie mode (max 1/2 of flash current) -respectively. +respectively. In order to add a capability of selecting the strobe signal source +(e.g. CPU or camera sensor) there is an additional switch required, independent +of the flash chip. The switch is controlled with pin control. Required properties: @@ -10,6 +12,13 @@ Required properties: - flen-gpios : Must be device tree identifier of the flash device FL_EN pin. - enset-gpios : Must be device tree identifier of the flash device EN_SET pin. +Optional properties: +- pinctrl-names : Must contain entries: "default", "host", "isp". Entries + "default" and "host" must refer to the same pin configuration + node, which sets the host as a strobe signal provider. Entry + "isp" must refer to the pin configuration node, which sets the + ISP as a strobe signal provider. + A discrete LED element connected to the device must be represented by a child node - see Documentation/devicetree/bindings/leds/common.txt. @@ -25,13 +34,22 @@ Required properties of the LED child node: Optional properties of the LED child node: - label : see Documentation/devicetree/bindings/leds/common.txt -Example (by Ct = 220nF, Rset = 160kohm): +Example (by Ct = 220nF, Rset = 160kohm and exynos4412-trats2 board with +a switch that allows for routing strobe signal either from the host or from +the camera sensor): + +#include "exynos4412.dtsi" aat1290 { compatible = "skyworks,aat1290"; flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default", "host", "isp"; + pinctrl-0 = <&camera_flash_host>; + pinctrl-1 = <&camera_flash_host>; + pinctrl-2 = <&camera_flash_isp>; + camera_flash: flash-led { label = "aat1290-flash"; led-max-microamp = <520833>; @@ -39,3 +57,17 @@ aat1290 { flash-timeout-us = <1940000>; }; }; + +&pinctrl_0 { + camera_flash_host: camera-flash-host { + samsung,pins = "gpj1-0"; + samsung,pin-function = <1>; + samsung,pin-val = <0>; + }; + + camera_flash_isp: camera-flash-isp { + samsung,pins = "gpj1-0"; + samsung,pin-function = <1>; + samsung,pin-val = <1>; + }; +}; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v10 4/8] DT: aat1290: Document handling external strobe sources 2015-06-08 9:02 ` [PATCH v10 4/8] DT: aat1290: Document handling external strobe sources Jacek Anaszewski @ 2015-06-10 18:12 ` Bryan Wu 0 siblings, 0 replies; 4+ messages in thread From: Bryan Wu @ 2015-06-10 18:12 UTC (permalink / raw) To: Jacek Anaszewski Cc: Linux LED Subsystem, linux-media@vger.kernel.org, Kyungmin Park, Pavel Machek, rpurdie@rpsys.net, Sakari Ailus, Sylwester Nawrocki, devicetree@vger.kernel.org On Mon, Jun 8, 2015 at 2:02 AM, Jacek Anaszewski <j.anaszewski@samsung.com> wrote: > This patch adds documentation for a pinctrl-names property. > The property, when present, is used for switching the source > of the strobe signal for the device. > Merged into my -devel branch and it won't be merged into 4.2.0 merge window but wait for one more cycle, since now it's quite late in 4.1.0 cycle. Thanks, -Bryan > Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Bryan Wu <cooloney@gmail.com> > Cc: Richard Purdie <rpurdie@rpsys.net> > Cc: Sakari Ailus <sakari.ailus@iki.fi> > Cc: devicetree@vger.kernel.org > --- > .../devicetree/bindings/leds/leds-aat1290.txt | 36 ++++++++++++++++++-- > 1 file changed, 34 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/leds/leds-aat1290.txt b/Documentation/devicetree/bindings/leds/leds-aat1290.txt > index ef88b9c..c05ed91 100644 > --- a/Documentation/devicetree/bindings/leds/leds-aat1290.txt > +++ b/Documentation/devicetree/bindings/leds/leds-aat1290.txt > @@ -2,7 +2,9 @@ > > The device is controlled through two pins: FL_EN and EN_SET. The pins when, > asserted high, enable flash strobe and movie mode (max 1/2 of flash current) > -respectively. > +respectively. In order to add a capability of selecting the strobe signal source > +(e.g. CPU or camera sensor) there is an additional switch required, independent > +of the flash chip. The switch is controlled with pin control. > > Required properties: > > @@ -10,6 +12,13 @@ Required properties: > - flen-gpios : Must be device tree identifier of the flash device FL_EN pin. > - enset-gpios : Must be device tree identifier of the flash device EN_SET pin. > > +Optional properties: > +- pinctrl-names : Must contain entries: "default", "host", "isp". Entries > + "default" and "host" must refer to the same pin configuration > + node, which sets the host as a strobe signal provider. Entry > + "isp" must refer to the pin configuration node, which sets the > + ISP as a strobe signal provider. > + > A discrete LED element connected to the device must be represented by a child > node - see Documentation/devicetree/bindings/leds/common.txt. > > @@ -25,13 +34,22 @@ Required properties of the LED child node: > Optional properties of the LED child node: > - label : see Documentation/devicetree/bindings/leds/common.txt > > -Example (by Ct = 220nF, Rset = 160kohm): > +Example (by Ct = 220nF, Rset = 160kohm and exynos4412-trats2 board with > +a switch that allows for routing strobe signal either from the host or from > +the camera sensor): > + > +#include "exynos4412.dtsi" > > aat1290 { > compatible = "skyworks,aat1290"; > flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; > enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; > > + pinctrl-names = "default", "host", "isp"; > + pinctrl-0 = <&camera_flash_host>; > + pinctrl-1 = <&camera_flash_host>; > + pinctrl-2 = <&camera_flash_isp>; > + > camera_flash: flash-led { > label = "aat1290-flash"; > led-max-microamp = <520833>; > @@ -39,3 +57,17 @@ aat1290 { > flash-timeout-us = <1940000>; > }; > }; > + > +&pinctrl_0 { > + camera_flash_host: camera-flash-host { > + samsung,pins = "gpj1-0"; > + samsung,pin-function = <1>; > + samsung,pin-val = <0>; > + }; > + > + camera_flash_isp: camera-flash-isp { > + samsung,pins = "gpj1-0"; > + samsung,pin-function = <1>; > + samsung,pin-val = <1>; > + }; > +}; > -- > 1.7.9.5 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v10 7/8] DT: Add documentation for exynos4-is 'flashes' property [not found] <1433754145-12765-1-git-send-email-j.anaszewski@samsung.com> 2015-06-08 9:02 ` [PATCH v10 4/8] DT: aat1290: Document handling external strobe sources Jacek Anaszewski @ 2015-06-08 9:02 ` Jacek Anaszewski [not found] ` <1433754145-12765-8-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 1 sibling, 1 reply; 4+ messages in thread From: Jacek Anaszewski @ 2015-06-08 9:02 UTC (permalink / raw) To: linux-leds, linux-media Cc: kyungmin.park, pavel, cooloney, rpurdie, sakari.ailus, s.nawrocki, Jacek Anaszewski, devicetree This patch adds a description of 'samsung,camera-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: devicetree@vger.kernel.org --- .../devicetree/bindings/media/samsung-fimc.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt index 922d6f8..0554cad 100644 --- a/Documentation/devicetree/bindings/media/samsung-fimc.txt +++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt @@ -40,6 +40,14 @@ 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: + +- samsung,camera-flashes - Array of pairs of phandles to the camera sensor + devices and flash LEDs respectively. The pairs must reflect the board + configuration, i.e. a sensor has to be able to strobe a flash LED by + hardware. Flash LED is represented by a child node of a flash LED + device (see Documentation/devicetree/bindings/leds/common.txt). + The 'camera' node must include at least one 'fimc' child node. @@ -166,6 +174,8 @@ Example: clock-output-names = "cam_a_clkout", "cam_b_clkout"; pinctrl-names = "default"; pinctrl-0 = <&cam_port_a_clk_active>; + samsung,camera-flashes = <&rear_camera &rear_flash>, + <&front_camera &front_flash>; status = "okay"; #address-cells = <1>; #size-cells = <1>; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
[parent not found: <1433754145-12765-8-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH v10 7/8] DT: Add documentation for exynos4-is 'flashes' property [not found] ` <1433754145-12765-8-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> @ 2015-06-10 18:18 ` Bryan Wu 0 siblings, 0 replies; 4+ messages in thread From: Bryan Wu @ 2015-06-10 18:18 UTC (permalink / raw) To: Jacek Anaszewski Cc: Linux LED Subsystem, linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Kyungmin Park, Pavel Machek, rpurdie-Fm38FmjxZ/leoWH0uzbU5w@public.gmane.org, Sakari Ailus, Sylwester Nawrocki, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Mon, Jun 8, 2015 at 2:02 AM, Jacek Anaszewski <j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> wrote: > This patch adds a description of 'samsung,camera-flashes' > property to the samsung-fimc.txt. > Please go ahead with my Ack Acked-by: Bryan Wu <cooloney-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Thanks, -Bryan > Signed-off-by: Jacek Anaszewski <j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> > Acked-by: Kyungmin Park <kyungmin.park-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> > Cc: Sylwester Nawrocki <s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > --- > .../devicetree/bindings/media/samsung-fimc.txt | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt > index 922d6f8..0554cad 100644 > --- a/Documentation/devicetree/bindings/media/samsung-fimc.txt > +++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt > @@ -40,6 +40,14 @@ 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: > + > +- samsung,camera-flashes - Array of pairs of phandles to the camera sensor > + devices and flash LEDs respectively. The pairs must reflect the board > + configuration, i.e. a sensor has to be able to strobe a flash LED by > + hardware. Flash LED is represented by a child node of a flash LED > + device (see Documentation/devicetree/bindings/leds/common.txt). > + > The 'camera' node must include at least one 'fimc' child node. > > > @@ -166,6 +174,8 @@ Example: > clock-output-names = "cam_a_clkout", "cam_b_clkout"; > pinctrl-names = "default"; > pinctrl-0 = <&cam_port_a_clk_active>; > + samsung,camera-flashes = <&rear_camera &rear_flash>, > + <&front_camera &front_flash>; > status = "okay"; > #address-cells = <1>; > #size-cells = <1>; > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-10 18:18 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <1433754145-12765-1-git-send-email-j.anaszewski@samsung.com> 2015-06-08 9:02 ` [PATCH v10 4/8] DT: aat1290: Document handling external strobe sources Jacek Anaszewski 2015-06-10 18:12 ` Bryan Wu 2015-06-08 9:02 ` [PATCH v10 7/8] DT: Add documentation for exynos4-is 'flashes' property Jacek Anaszewski [not found] ` <1433754145-12765-8-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2015-06-10 18:18 ` Bryan Wu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).