From patchwork Sat Sep 11 01:28:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 4308 Return-path: Envelope-to: mchehab@pedra Delivery-date: Sat, 11 Sep 2010 10:18:54 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1OuPyn-00027z-Ml for mchehab@pedra; Sat, 11 Sep 2010 10:18:53 -0300 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Sat, 11 Sep 2010 10:18:53 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OuEuG-0007Ew-6N; Sat, 11 Sep 2010 01:29:28 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755334Ab0IKB3Z (ORCPT + 1 other); Fri, 10 Sep 2010 21:29:25 -0400 Received: from d1.icnet.pl ([212.160.220.21]:41717 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542Ab0IKB3Y (ORCPT ); Fri, 10 Sep 2010 21:29:24 -0400 Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.intranet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1OuEuB-0002np-Kn; Sat, 11 Sep 2010 03:29:23 +0200 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: linux-media@vger.kernel.org, "linux-omap@vger.kernel.org" Subject: [PATCH v2 6/6] OMAP1: Amstrad Delta: add camera controlled LEDS trigger Date: Sat, 11 Sep 2010 03:28:58 +0200 User-Agent: KMail/1.9.10 Cc: Guennadi Liakhovetski , Tony Lindgren , Richard Purdie , "Discussion of the Amstrad E3 emailer hardware/software" References: <201009110317.54899.jkrzyszt@tis.icnet.pl> In-Reply-To: <201009110317.54899.jkrzyszt@tis.icnet.pl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201009110329.01171.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Mauro Carvalho Chehab This patch extends the Amstrad Delta camera support with LEDS trigger that can be used for automatic control of the on-board camera LED. The led turns on automatically on camera device open and turns off on camera device close. Created and tested against linux-2.6.36-rc3. Works on top of patch 5/6, "OMAP1: Amstrad Delta: add support for on-board camera" Signed-off-by: Janusz Krzysztofik --- Having no comments received on v1 of this patch, I assume nobody could see any benefit if I implemented this idea at the SoC camera or OMAP1 camera level, so I'm leaveing it as an Amstrad Delta only feature, as it originally was for v1. Thanks, Janusz v1->v2 changes: - no functional changes, - refreshed against linux-2.6.36-rc3. arch/arm/mach-omap1/board-ams-delta.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 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 diff -upr linux-2.6.36-rc3.orig/arch/arm/mach-omap1/board-ams-delta.c linux-2.6.36-rc3/arch/arm/mach-omap1/board-ams-delta.c --- linux-2.6.36-rc3.orig/arch/arm/mach-omap1/board-ams-delta.c 2010-09-10 22:01:24.000000000 +0200 +++ linux-2.6.36-rc3/arch/arm/mach-omap1/board-ams-delta.c 2010-09-10 22:08:29.000000000 +0200 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -222,11 +223,30 @@ static struct i2c_board_info ams_delta_c }, }; +#ifdef CONFIG_LEDS_TRIGGERS +DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger); + +static int ams_delta_camera_power(struct device *dev, int power) +{ + /* + * turn on camera LED + */ + if (power) + led_trigger_event(ams_delta_camera_led_trigger, LED_FULL); + else + led_trigger_event(ams_delta_camera_led_trigger, LED_OFF); + return 0; +} +#else +#define ams_delta_camera_power NULL +#endif + static struct soc_camera_link __initdata ams_delta_iclink = { .bus_id = 0, /* OMAP1 SoC camera bus */ .i2c_adapter_id = 1, .board_info = &ams_delta_camera_board_info[0], .module_name = "ov6650", + .power = ams_delta_camera_power, }; static struct platform_device ams_delta_camera_device = { @@ -281,6 +301,10 @@ static void __init ams_delta_init(void) omap1_usb_init(&ams_delta_usb_config); omap1_set_camera_info(&ams_delta_camera_platform_data); +#ifdef CONFIG_LEDS_TRIGGERS + led_trigger_register_simple("ams_delta_camera", + &ams_delta_camera_led_trigger); +#endif platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices)); #ifdef CONFIG_AMS_DELTA_FIQ