From patchwork Wed May 20 14:10:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 6446671 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 614E0C0432 for ; Wed, 20 May 2015 14:11:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5401F203A0 for ; Wed, 20 May 2015 14:11:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3599F20395 for ; Wed, 20 May 2015 14:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753452AbbETOLP (ORCPT ); Wed, 20 May 2015 10:11:15 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:60817 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751655AbbETOLO (ORCPT ); Wed, 20 May 2015 10:11:14 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NON00IEFJEO7U70@mailout1.samsung.com>; Wed, 20 May 2015 23:11:12 +0900 (KST) X-AuditID: cbfee61a-f79516d000006302-19-555c95ff2fea Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B2.83.25346.FF59C555; Wed, 20 May 2015 23:11:12 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NON00FYIJD5DP20@mmp1.samsung.com>; Wed, 20 May 2015 23:11:11 +0900 (KST) From: Jacek Anaszewski To: linux-leds@vger.kernel.org, linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, pavel@ucw.cz, cooloney@gmail.com, rpurdie@rpsys.net, sakari.ailus@iki.fi, s.nawrocki@samsung.com, Jacek Anaszewski Subject: [PATCH v8 5/8] exynos4-is: Add support for v4l2-flash subdevs Date: Wed, 20 May 2015 16:10:12 +0200 Message-id: <1432131015-22397-6-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1432131015-22397-1-git-send-email-j.anaszewski@samsung.com> References: <1432131015-22397-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsVy+t9jAV2GaTGhBi2LGC2O7pzIZNF79Tmj xdmmN+wWW9+sY7To2bCV1eLuqaNsFrt3PWW1OPymndXizP6VbA6cHjtn3WX3OPx1IYvHnvk/ WD36tqxi9Fix+ju7x+dNcgFsUVw2Kak5mWWpRfp2CVwZe6b9YC3Yq1oxecFaxgbGhfJdjJwc EgImEv0/Z7JB2GISF+6tB7OFBBYxSrxtS+1i5AKyfzJKfJr3iREkwSZgKPHzxWsmEFtEwFpi 1qHpLCBFzAIbGCUuT2hkAUkIC7hJ7Dt+G6yBRUBVYuqLR+xdjBwcvAIeEg03dUFMCQEFiTmT bEAqOAU8Jc6/WcUKsddD4tedD6wTGHkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAgO uGdSOxhXNlgcYhTgYFTi4S04EB0qxJpYVlyZe4hRgoNZSYRXc2JMqBBvSmJlVWpRfnxRaU5q 8SFGaQ4WJXHek/k+oUIC6YklqdmpqQWpRTBZJg5OqQbG9t3lnmZnfFr/zT30/DuLxBZ+pfwP znli8jO86iweetpPnu4es9JjSgUnwx9zhQVfu5gbqszufuA9+dJubuHsQjnBtoJr5pMnfdC0 7L+7tK6gf1+/cUnZEsuclq2rV17RYqxYLrpLeunsB5fLBHYyax2zXN0l0mbstY6h040j6NiO 8pv3wuyVWIozEg21mIuKEwHaRNoHNAIAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for external v4l2-flash devices. The support includes parsing "samsung,flash-led" DT property and asynchronous subdevice registration. Signed-off-by: Jacek Anaszewski Acked-by: Kyungmin Park Cc: Sylwester Nawrocki --- drivers/media/platform/exynos4-is/media-dev.c | 39 +++++++++++++++++++++++-- drivers/media/platform/exynos4-is/media-dev.h | 13 ++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index f315ef9..80cecd8 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -451,6 +451,28 @@ rpm_put: return ret; } +static void fimc_md_register_flash_entities(struct fimc_md *fmd) +{ + int i; + + fmd->num_flashes = 0; + + for (i = 0; i < fmd->num_sensors; i++) { + const struct device_node *np = + fmd->sensor[i].asd.match.of.node; + const int nf = fmd->num_flashes; + + np = of_parse_phandle(np, "samsung,flash-led", 0); + if (!np) + continue; + + fmd->flash[nf].asd.match_type = V4L2_ASYNC_MATCH_OF; + fmd->flash[nf].asd.match.of.node = np; + fmd->async_subdevs[fmd->num_sensors + nf] = &fmd->flash[nf].asd; + fmd->num_flashes++; + } +} + static int __of_get_csis_id(struct device_node *np) { u32 reg = 0; @@ -1275,6 +1297,15 @@ static int subdev_notifier_bound(struct v4l2_async_notifier *notifier, struct fimc_sensor_info *si = NULL; int i; + /* Register flash subdev if detected any */ + for (i = 0; i < ARRAY_SIZE(fmd->flash); i++) { + if (fmd->flash[i].asd.match.of.node == subdev->of_node) { + fmd->flash[i].subdev = subdev; + fmd->num_flashes++; + return 0; + } + } + /* Find platform data for this sensor subdev */ for (i = 0; i < ARRAY_SIZE(fmd->sensor); i++) if (fmd->sensor[i].asd.match.of.node == subdev->dev->of_node) @@ -1385,6 +1416,8 @@ static int fimc_md_probe(struct platform_device *pdev) goto err_m_ent; } + fimc_md_register_flash_entities(fmd); + mutex_unlock(&fmd->media_dev.graph_mutex); ret = device_create_file(&pdev->dev, &dev_attr_subdev_conf_mode); @@ -1401,12 +1434,14 @@ static int fimc_md_probe(struct platform_device *pdev) goto err_attr; } - if (fmd->num_sensors > 0) { + if (fmd->num_sensors > 0 || fmd->num_flashes > 0) { fmd->subdev_notifier.subdevs = fmd->async_subdevs; - fmd->subdev_notifier.num_subdevs = fmd->num_sensors; + fmd->subdev_notifier.num_subdevs = fmd->num_sensors + + fmd->num_flashes; fmd->subdev_notifier.bound = subdev_notifier_bound; fmd->subdev_notifier.complete = subdev_notifier_complete; fmd->num_sensors = 0; + fmd->num_flashes = 0; ret = v4l2_async_notifier_register(&fmd->v4l2_dev, &fmd->subdev_notifier); diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/exynos4-is/media-dev.h index 0321454..d4eed34 100644 --- a/drivers/media/platform/exynos4-is/media-dev.h +++ b/drivers/media/platform/exynos4-is/media-dev.h @@ -34,6 +34,8 @@ #define FIMC_MAX_SENSORS 4 #define FIMC_MAX_CAMCLKS 2 +#define FIMC_MAX_FLASHES 4 +#define FIMC_MAX_ASYNC_SUBDEVS (FIMC_MAX_SENSORS + FIMC_MAX_FLASHES) #define DEFAULT_SENSOR_CLK_FREQ 24000000U /* LCD/ISP Writeback clocks (PIXELASYNCMx) */ @@ -93,6 +95,11 @@ struct fimc_sensor_info { struct fimc_dev *host; }; +struct fimc_flash_info { + struct v4l2_subdev *subdev; + struct v4l2_async_subdev asd; +}; + struct cam_clk { struct clk_hw hw; struct fimc_md *fmd; @@ -104,6 +111,8 @@ struct cam_clk { * @csis: MIPI CSIS subdevs data * @sensor: array of registered sensor subdevs * @num_sensors: actual number of registered sensors + * @flash: array of registered flash subdevs + * @num_flashes: actual number of registered flashes * @camclk: external sensor clock information * @fimc: array of registered fimc devices * @fimc_is: fimc-is data structure @@ -123,6 +132,8 @@ struct fimc_md { struct fimc_csis_info csis[CSIS_MAX_ENTITIES]; struct fimc_sensor_info sensor[FIMC_MAX_SENSORS]; int num_sensors; + struct fimc_flash_info flash[FIMC_MAX_FLASHES]; + int num_flashes; struct fimc_camclk_info camclk[FIMC_MAX_CAMCLKS]; struct clk *wbclk[FIMC_MAX_WBCLKS]; struct fimc_lite *fimc_lite[FIMC_LITE_MAX_DEVS]; @@ -149,7 +160,7 @@ struct fimc_md { } clk_provider; struct v4l2_async_notifier subdev_notifier; - struct v4l2_async_subdev *async_subdevs[FIMC_MAX_SENSORS]; + struct v4l2_async_subdev *async_subdevs[FIMC_MAX_ASYNC_SUBDEVS]; bool user_subdev_api; spinlock_t slock;