From patchwork Sat Mar 4 08:55:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 39747 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ck5U9-0003YA-6d; Sat, 04 Mar 2017 08:56:17 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-6) with esmtp id 1ck5U5-0008TO-63; Sat, 04 Mar 2017 09:56:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751591AbdCDIz4 (ORCPT + 1 other); Sat, 4 Mar 2017 03:55:56 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:42637 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdCDIz4 (ORCPT ); Sat, 4 Mar 2017 03:55:56 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 32866819D1; Sat, 4 Mar 2017 09:55:52 +0100 (CET) Date: Sat, 4 Mar 2017 09:55:51 +0100 From: Pavel Machek To: Sakari Ailus Cc: sre@kernel.org, pali.rohar@gmail.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, laurent.pinchart@ideasonboard.com, mchehab@kernel.org, ivo.g.dimitrov.75@gmail.com Subject: Re: camera subdevice support was Re: [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times Message-ID: <20170304085551.GA19769@amd> References: <20170220103114.GA9800@amd> <20170220130912.GT16975@valkosipuli.retiisi.org.uk> <20170220135636.GU16975@valkosipuli.retiisi.org.uk> <20170221110721.GD5021@amd> <20170221111104.GD16975@valkosipuli.retiisi.org.uk> <20170225000918.GB23662@amd> <20170225134444.6qzumpvasaow5qoj@ihha.localdomain> <20170225215321.GA29886@amd> <20170225231754.GY16975@valkosipuli.retiisi.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170225231754.GY16975@valkosipuli.retiisi.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) 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: 2017.3.4.84516 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' BODY_PARA_IS_SENTENCE_URL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, KNOWN_FREEWEB_URI 0.05, MSGID_ADDED_BY_MTA 0.05, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, INVALID_MSGID_NO_FQDN 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __ATTACHMENT_SIZE_0_10K 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CD 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __FORWARDED_MSG 0, __HAS_ATTACHMENT 0, __HAS_ATTACHMENT1 0, __HAS_ATTACHMENT2 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __KNOWN_FREEWEB_URI2 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_TEXT_P2 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_MAILTO 0, __URI_NS , __URI_WITH_PATH 0, __USER_AGENT 0' Dobry den! :-) > > > > Ok, I got the camera sensor to work. No subdevices support, so I don't > > > > have focus (etc) working, but that's a start. I also had to remove > > > > video-bus-switch support; but I guess it will be easier to use > > > > video-multiplexer patches... > > > > > > > > I'll have patches over weekend. > > > > > > I briefly looked at what's there --- you do miss the video nodes for the > > > non-sensor sub-devices, and they also don't show up in the media graph, > > > right? > > > > Yes. > > > > > I guess they don't end up matching in the async list. > > > > How should they get to the async list? > > The patch you referred to does that. The problem is, it does make the bus > configuration a pointer as well. There should be two patches. That's not a > lot of work to separate them though. But it should be done. > > > > > > I think we need to make the non-sensor sub-device support more generic; > > > it's not just the OMAP 3 ISP that needs it. I think we need to document > > > the property for the flash phandle as well; I can write one, or refresh > > > an existing one that I believe already exists. > > > > > > How about calling it either simply "flash" or "camera-flash"? Similarly > > > for lens: "lens" or "camera-lens". I have a vague feeling the "camera-" > > > prefix is somewhat redundant, so I'd just go for "flash" or "lens". > > > > Actually, I'd go for "flash" and "focus-coil". There may be other > > lens properties, such as zoom, mirror movement, lens identification, > > ... > > Good point. Still there may be other ways to move the lens than the voice > coil (which sure is cheap), so how about "flash" and "lens-focus"? Ok, so something like this? (Yes, needs binding documentation and you wanted it in the core.. can fix.) BTW, fwnode_handle_put() seems to be missing in the success path of isp_fwnodes_parse() -- can you check that? Best regards, Pavel diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index c80397a..6f6fbed 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2114,7 +2114,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwn, buscfg->bus.ccp2.lanecfg.data[0].pol = vfwn.bus.mipi_csi1.lane_polarity[1]; - dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i, + dev_dbg(dev, "data lane %u polarity %u, pos %u\n", 0, buscfg->bus.ccp2.lanecfg.data[0].pol, buscfg->bus.ccp2.lanecfg.data[0].pos); @@ -2162,10 +2162,64 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwn, return 0; } +static int camera_subdev_parse(struct device *dev, struct v4l2_async_notifier *notifier, + const char *key) +{ + struct device_node *node; + struct isp_async_subdev *isd; + + printk("Looking for %s\n", key); + + node = of_parse_phandle(dev->of_node, key, 0); + if (!node) + return 0; + + printk("Having subdevice: %p\n", node); + + isd = devm_kzalloc(dev, sizeof(*isd), GFP_KERNEL); + if (!isd) + return -ENOMEM; + + notifier->subdevs[notifier->num_subdevs] = &isd->asd; + + isd->asd.match.of.node = node; + if (!isd->asd.match.of.node) { + dev_warn(dev, "bad remote port parent\n"); + return -EIO; + } + + isd->asd.match_type = V4L2_ASYNC_MATCH_OF; + notifier->num_subdevs++; + + return 0; +} + +static int camera_subdevs_parse(struct device *dev, struct v4l2_async_notifier *notifier, + int max) +{ + int res = 0; + + printk("Going through camera-flashes\n"); + if (notifier->num_subdevs < max) { + res = camera_subdev_parse(dev, notifier, "flash"); + if (res) + return res; + } + + if (notifier->num_subdevs < max) { + res = camera_subdev_parse(dev, notifier, "lens-focus"); + if (res) + return res; + } + + return 0; +} + static int isp_fwnodes_parse(struct device *dev, struct v4l2_async_notifier *notifier) { struct fwnode_handle *fwn = NULL; + int res = 0; notifier->subdevs = devm_kcalloc( dev, ISP_MAX_SUBDEVS, sizeof(*notifier->subdevs), GFP_KERNEL); @@ -2199,6 +2253,15 @@ static int isp_fwnodes_parse(struct device *dev, notifier->num_subdevs++; } + /* FIXME: missing put in the success path? */ + + res = camera_subdevs_parse(dev, notifier, ISP_MAX_SUBDEVS); + if (res) + goto error; + + if (notifier->num_subdevs == ISP_MAX_SUBDEVS) { + printk("isp: Maybe too many devices?\n"); + } return notifier->num_subdevs; error: