From patchwork Mon Jun 8 09:02:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 30101 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1syA-0000yK-Ut; Mon, 08 Jun 2015 11:03:46 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-7) with esmtp id 1Z1sy8-0000OU-2c; Mon, 08 Jun 2015 11:03:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932442AbbFHJDg (ORCPT + 1 other); Mon, 8 Jun 2015 05:03:36 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:54541 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753089AbbFHJDT (ORCPT ); Mon, 8 Jun 2015 05:03:19 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NPM02USFBTHT500@mailout4.samsung.com>; Mon, 08 Jun 2015 18:03:17 +0900 (KST) X-AuditID: cbfee61b-f79416d0000014c0-a2-55755a55eebb Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9E.F3.05312.55A55755; Mon, 8 Jun 2015 18:03:17 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NPM001AYBS2ERZ0@mmp2.samsung.com>; Mon, 08 Jun 2015 18:03:17 +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 v10 8/8] exynos4-is: Add support for v4l2-flash subdevs Date: Mon, 08 Jun 2015 11:02:25 +0200 Message-id: <1433754145-12765-9-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1433754145-12765-1-git-send-email-j.anaszewski@samsung.com> References: <1433754145-12765-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsVy+t9jQd3QqNJQg1sHDS2O7pzIZNF79Tmj xdmmN+wWW9+sY7To2bCV1eLuqaNsFrt3PWW1OPymndXizP6VbA6cHjtn3WX3OPx1IYvHnvk/ WD36tqxi9Fix+ju7x+dNcgFsUVw2Kak5mWWpRfp2CVwZX+7sZS1oVq2Yfq2RuYHxiFwXIyeH hICJxIPWdcwQtpjEhXvr2boYuTiEBKYzSqz8uw3K+ckocfLpKUaQKjYBQ4mfL14zgdgiAtYS sw5NZwEpYhbYwChxeUIjkMPBISzgLjHjQSFIDYuAqsSJzfPYQWxeAQ+Jy1vug5VICChIzJlk AxLmFPCU2N+8nwkkLARUsn5i0ARG3gWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxggPu mfQOxlUNFocYBTgYlXh4DywqCRViTSwrrsw9xCjBwawkwstkURoqxJuSWFmVWpQfX1Sak1p8 iFGag0VJnPdkvk+okEB6YklqdmpqQWoRTJaJg1OqgVErvfzMLY4IK42mzUzxVov0Lxp3N4Zq J2jw+cz9KM0pMOFFRmqwnHzN7sBVv1cECjA0vtm8nJG5tvPNlR1eK3+0/xZ/96iIv/LandNP FnkbF2pu2fnUf3f4tBkWe29NSC5gFeh6cv7/scvMS60s54lMOT3xeatsAu/knPVllaZNegfS TjpqByixFGckGmoxFxUnAgBpDUE5NAIAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.6.8.85716 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' This patch adds support for external v4l2-flash devices. The support includes parsing "camera-flashes" DT property and asynchronous sub-device registration. Signed-off-by: Jacek Anaszewski Acked-by: Kyungmin Park Cc: Sylwester Nawrocki Acked-by: Bryan Wu --- drivers/media/platform/exynos4-is/media-dev.c | 75 ++++++++++++++++++++++++- drivers/media/platform/exynos4-is/media-dev.h | 4 ++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index e3d7b70..e387fd2 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -455,6 +455,63 @@ rpm_put: return ret; } +static int fimc_md_register_flash_entities(struct fimc_md *fmd) +{ + struct device_node *parent = fmd->pdev->dev.of_node, *np_sensor, + *np_flash; + struct v4l2_async_notifier *notifier = &fmd->subdev_notifier; + struct device *dev = &fmd->pdev->dev; + struct v4l2_async_subdev *asd; + int i, j, num_flashes = 0, num_elems; + + num_elems = of_property_count_u32_elems(parent, + "samsung,camera-flashes"); + /* samsung,camera-flashes property is optional */ + if (num_elems < 0) + return 0; + + /* samsung,camera-flashes array must have even number of elements */ + if ((num_elems & 1) || (num_elems > FIMC_MAX_SENSORS * 2)) + return -EINVAL; + + for (i = 0; i < num_elems; i += 2) { + /* + * The pair of camera sensor and flash LED phandles reflects + * the physical connection on the board, which allows for the + * camera sensor to strobe the flash by raising a hardware pin. + * This property just describes the association. + */ + np_sensor = of_parse_phandle(parent, + "samsung,camera-flashes", i); + + for (j = 0; j < fmd->num_sensors; j++) + if (fmd->async_subdevs.sensors[j].match.of.node == + np_sensor) + break; + + of_node_put(np_sensor); + + /* + * If the camera sensor phandle isn't known to the media device + * controller, then raise a warning only. + */ + if (j == fmd->num_sensors) + dev_warn(dev, "sensor verification failed for a flash\n"); + + np_flash = of_parse_phandle(parent, "samsung,camera-flashes", + i + 1); + + asd = &fmd->async_subdevs.flashes[num_flashes++]; + asd->match_type = V4L2_ASYNC_MATCH_OF; + asd->match.of.node = np_flash; + notifier->subdevs[notifier->num_subdevs++] = asd; + + of_node_put(np_flash); + } + + return 0; +} + static int __of_get_csis_id(struct device_node *np) { u32 reg = 0; @@ -1280,6 +1337,15 @@ static int subdev_notifier_bound(struct v4l2_async_notifier *notifier, struct fimc_sensor_info *si = NULL; int i; + /* + * Flash sub-devices are controlled independently of ISP, and thus + * verify only that the sub-device being matched was previously + * registered. + */ + for (i = 0; i < ARRAY_SIZE(async_subdevs->flashes); i++) + if (&async_subdevs->flashes[i] == asd) + return 0; + /* Find platform data for this sensor subdev */ for (i = 0; i < ARRAY_SIZE(async_subdevs->sensors); i++) if (fmd->sensor[i].asd == asd) @@ -1326,13 +1392,18 @@ static int fimc_md_register_async_entities(struct fimc_md *fmd) { struct device *dev = fmd->media_dev.dev; struct v4l2_async_notifier *notifier = &fmd->subdev_notifier; + int ret; - notifier->subdevs = devm_kcalloc(dev, FIMC_MAX_SENSORS, + notifier->subdevs = devm_kcalloc(dev, FIMC_MAX_ASYNC_ENTITIES, sizeof(*notifier->subdevs), GFP_KERNEL); if (!notifier->subdevs) return -ENOMEM; - return fimc_md_register_sensor_entities(fmd); + ret = fimc_md_register_sensor_entities(fmd); + if (ret) + return -EINVAL; + + return fimc_md_register_flash_entities(fmd); } static int fimc_md_probe(struct platform_device *pdev) diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/exynos4-is/media-dev.h index ff6d020..be9205c 100644 --- a/drivers/media/platform/exynos4-is/media-dev.h +++ b/drivers/media/platform/exynos4-is/media-dev.h @@ -33,7 +33,10 @@ #define PINCTRL_STATE_IDLE "idle" #define FIMC_MAX_SENSORS 4 +#define FIMC_MAX_FLASHES 4 +#define FIMC_MAX_ASYNC_ENTITIES (FIMC_MAX_SENSORS + FIMC_MAX_FLASHES) #define FIMC_MAX_CAMCLKS 2 + #define DEFAULT_SENSOR_CLK_FREQ 24000000U /* LCD/ISP Writeback clocks (PIXELASYNCMx) */ @@ -95,6 +98,7 @@ struct fimc_sensor_info { struct fimc_async_subdevs { struct v4l2_async_subdev sensors[FIMC_MAX_SENSORS]; + struct v4l2_async_subdev flashes[FIMC_MAX_FLASHES]; }; struct cam_clk {