From patchwork Tue Aug 27 09:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 11116459 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 058DD1395 for ; Tue, 27 Aug 2019 09:22:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E406321872 for ; Tue, 27 Aug 2019 09:22:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729433AbfH0JWo (ORCPT ); Tue, 27 Aug 2019 05:22:44 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:47459 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725912AbfH0JWo (ORCPT ); Tue, 27 Aug 2019 05:22:44 -0400 X-Originating-IP: 87.18.63.98 Received: from uno.homenet.telecomitalia.it (unknown [87.18.63.98]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 3271E1C0003; Tue, 27 Aug 2019 09:22:40 +0000 (UTC) From: Jacopo Mondi To: Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Laurent Pinchart , tfiga@google.com Cc: Jacopo Mondi , linux-media@vger.kernel.org (open list:MEDIA INPUT INFRASTRUCTURE (V4L/DVB)) Subject: [PATCH v2 06/10] media: v4l2-fwnode: Add helper to register controls from fw Date: Tue, 27 Aug 2019 11:23:34 +0200 Message-Id: <20190827092339.8858-9-jacopo@jmondi.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827092339.8858-1-jacopo@jmondi.org> References: <20190827092339.8858-1-jacopo@jmondi.org> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add the 'v4l2_fwnode_register_controls()' helper to v4l2-fwnode. The function parses the device node and endpoint firmware properties to which a v4l2 control is associated to and registers the control with the provided handler. Signed-off-by: Jacopo Mondi --- drivers/media/v4l2-core/v4l2-fwnode.c | 57 +++++++++++++++++++++++++++ include/media/v4l2-fwnode.h | 30 ++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index 3bd1888787eb..669801fceb64 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -595,6 +596,62 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link) } EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link); +int v4l2_fwnode_register_controls(struct fwnode_handle *fwnode, + struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ctrl_ops) +{ + u32 val; + int ret; + + ret = fwnode_property_read_u32(fwnode, "location", &val); + if (!ret) { + switch (val) { + case V4L2_LOCATION_FRONT: + case V4L2_LOCATION_BACK: + case V4L2_LOCATION_EXTERNAL: + break; + default: + pr_warn("Unsupported location: %u\n", val); + return -EINVAL; + } + + if (v4l2_ctrl_find(hdl, V4L2_CID_CAMERA_SENSOR_LOCATION)) + pr_debug("Skip control '%s': already registered", + v4l2_ctrl_get_name( + V4L2_CID_CAMERA_SENSOR_LOCATION)); + else + v4l2_ctrl_new_std(hdl, ctrl_ops, + V4L2_CID_CAMERA_SENSOR_LOCATION, + val, val, 1, val); + } + + ret = fwnode_property_read_u32(fwnode, "rotation", &val); + if (!ret) { + if (val > 360) { + pr_warn("Unsupported rotation: %u\n", val); + return -EINVAL; + } + + if (v4l2_ctrl_find(hdl, V4L2_CID_CAMERA_SENSOR_ROTATION)) + pr_debug("Skip control '%s': already registered", + v4l2_ctrl_get_name( + V4L2_CID_CAMERA_SENSOR_ROTATION)); + else + v4l2_ctrl_new_std(hdl, ctrl_ops, + V4L2_CID_CAMERA_SENSOR_ROTATION, + val, val, 1, val); + } + + if (hdl->error) { + pr_warn("Failed to register controls from firmware: %d\n", + hdl->error); + return hdl->error; + } + + return 0; +} +EXPORT_SYMBOL_GPL(v4l2_fwnode_register_controls); + static int v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, struct v4l2_async_notifier *notifier, diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h index f6a7bcd13197..0dad6968bde9 100644 --- a/include/media/v4l2-fwnode.h +++ b/include/media/v4l2-fwnode.h @@ -25,6 +25,8 @@ struct fwnode_handle; struct v4l2_async_notifier; struct v4l2_async_subdev; +struct v4l2_ctrl_handler; +struct v4l2_ctrl_ops; #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4 @@ -233,6 +235,34 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode, */ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link); +/** + * v4l2_fwnode_register_controls() - parse device and endpoint fwnode + * properties and register a v4l2 control + * for each of them + * @fwnode: pointer to the device fwnode handle + * @hdl: pointer to the v4l2 control handler to register controls with + * @ctrl_ops: pointer to the v4l2 control operations to register with the handler + * + * Parse the @fwnode device and endpoint properties to which a v4l2 control + * is associated and register them with the provided handler @hdl. + * Currently the following v4l2 controls are parsed and registered: + * - V4L2_CID_CAMERA_SENSOR_LOCATION; + * - V4L2_CID_CAMERA_SENSOR_ROTATION; + * + * Controls already registered by the caller with the @hdl control handler are + * not overwritten. Callers should register the controls they want to handle + * themselves before calling this function. + * + * NOTE: This function locks the @hdl control handler mutex, the caller shall + * not hold the lock when calling this function. + * + * Return: 0 on success, -EINVAL if the fwnode properties are not correctly + * specified. + */ +int v4l2_fwnode_register_controls(struct fwnode_handle *fwnode, + struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ctrl_ops); + /** * typedef parse_endpoint_func - Driver's callback function to be called on * each V4L2 fwnode endpoint.