From: Marco Felsch <m.felsch@pengutronix.de>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
hans.verkuil@cisco.com, jacopo+renesas@jmondi.org,
robh+dt@kernel.org, laurent.pinchart@ideasonboard.com
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
kernel@pengutronix.de
Subject: [PATCH v7 03/13] media: v4l2-fwnode: add initial connector parsing support
Date: Thu, 15 Aug 2019 13:57:37 +0200 [thread overview]
Message-ID: <20190815115747.24018-4-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20190815115747.24018-1-m.felsch@pengutronix.de>
The patch adds the initial connector parsing code, so we can move from a
driver specific parsing code to a generic one. Currently only the
generic fields and the analog-connector specific fields are parsed. Parsing
the other connector specific fields can be added by a simple callbacks.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
[1] https://patchwork.kernel.org/cover/10794703/
v7:
@Jacopo: I dropped your r b tag becuase of the amount of changes I
made..
- drop unnecessary comments
- fix commet style
- s/v4l2_fwnode_connector_conv.name/v4l2_fwnode_connector_conv.compatible/
- make label size variable and drop V4L2_CONNECTOR_MAX_LABEL usage
- do not assign a default label in case of no label was specified
- remove useless /* fall through */ comments
- add support for N connector links
- rename local variables to be more meaningful
- adjust kernedoc
- add v4l2_fwnode_connector_free()
- improve error handling (use different error values)
- make use of pr_warn_once()
v6:
- use unsigned count var
- fix comment and style issues
- place '/* fall through */' to correct places
- fix error handling and cleanup by releasing fwnode
- drop vga and dvi parsing support as those connectors are rarely used
these days
v5:
- s/strlcpy/strscpy/
v2-v4:
- nothing since the patch was squashed from series [1] into this
series.
---
drivers/media/v4l2-core/v4l2-fwnode.c | 137 ++++++++++++++++++++++++++
include/media/v4l2-fwnode.h | 38 +++++++
2 files changed, 175 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 3bd1888787eb..c6eb8a8105cc 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -595,6 +595,143 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
+static const struct v4l2_fwnode_connector_conv {
+ enum v4l2_connector_type type;
+ const char *compatible;
+} connectors[] = {
+ {
+ .type = V4L2_CON_COMPOSITE,
+ .compatible = "composite-video-connector",
+ }, {
+ .type = V4L2_CON_SVIDEO,
+ .compatible = "svideo-connector",
+ }, {
+ .type = V4L2_CON_HDMI,
+ .compatible = "hdmi-connector",
+ },
+};
+
+static enum v4l2_connector_type
+v4l2_fwnode_string_to_connector_type(const char *con_str)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(connectors); i++)
+ if (!strcmp(con_str, connectors[i].compatible))
+ return connectors[i].type;
+
+ return V4L2_CON_UNKNOWN;
+}
+
+static int
+v4l2_fwnode_connector_parse_analog(struct fwnode_handle *fwnode,
+ struct v4l2_fwnode_connector *vc)
+{
+ u32 tvnorms;
+ int ret;
+
+ ret = fwnode_property_read_u32(fwnode, "tvnorms", &tvnorms);
+
+ /* The tvnorms property is optional. */
+ vc->connector.analog.supported_tvnorms = ret ? V4L2_STD_ALL : tvnorms;
+
+ return 0;
+}
+
+void v4l2_fwnode_connector_free(struct v4l2_fwnode_connector *connector)
+{
+ unsigned int i;
+
+ if (IS_ERR_OR_NULL(connector))
+ return;
+
+ for (i = 0; i < connector->nr_of_links; i++)
+ v4l2_fwnode_put_link(&connector->links[i]);
+ kfree(connector->links);
+}
+EXPORT_SYMBOL_GPL(v4l2_fwnode_connector_free);
+
+int v4l2_fwnode_connector_alloc_parse(struct fwnode_handle *fwnode,
+ struct v4l2_fwnode_connector *connector)
+{
+ struct fwnode_handle *remote_pp, *remote_ep;
+ const char *type_name;
+ unsigned int i = 0, ep_num = 0;
+ int err;
+
+ memset(connector, 0, sizeof(*connector));
+
+ remote_pp = fwnode_graph_get_remote_port_parent(fwnode);
+ if (!remote_pp)
+ return -ENOLINK;
+
+ /* Parse all common properties first. */
+ fwnode_graph_for_each_endpoint(remote_pp, remote_ep)
+ ep_num++;
+
+ connector->nr_of_links = ep_num;
+ connector->links = kmalloc_array(ep_num, sizeof(*connector->links),
+ GFP_KERNEL);
+ if (!connector->links) {
+ err = -ENOMEM;
+ goto err_put_fwnode;
+ }
+
+ fwnode_graph_for_each_endpoint(remote_pp, remote_ep) {
+ err = v4l2_fwnode_parse_link(remote_ep, &connector->links[i]);
+ if (err) {
+ fwnode_handle_put(remote_ep);
+ goto err_free_links;
+ }
+ i++;
+ }
+
+ /*
+ * Links reference counting guarantees access -> no duplication needed
+ */
+ fwnode_property_read_string(remote_pp, "label", &connector->label);
+
+ /* The connector-type is stored within the compatible string. */
+ err = fwnode_property_read_string(remote_pp, "compatible", &type_name);
+ if (err) {
+ err = -EINVAL;
+ goto err_free_links;
+ }
+ connector->type = v4l2_fwnode_string_to_connector_type(type_name);
+
+ /* Now parse the connector specific properties. */
+ switch (connector->type) {
+ case V4L2_CON_COMPOSITE:
+ case V4L2_CON_SVIDEO:
+ err = v4l2_fwnode_connector_parse_analog(remote_pp, connector);
+ break;
+ case V4L2_CON_HDMI:
+ pr_warn_once("Connector specific parsing is currently not supported for %s\n",
+ type_name);
+ err = 0;
+ break;
+ case V4L2_CON_UNKNOWN:
+ default:
+ pr_err("Unknown connector type\n");
+ err = -EINVAL;
+ goto err_free_links;
+ };
+
+ fwnode_handle_put(remote_pp);
+
+ return err;
+
+err_free_links:
+ for (i = 0; i < ep_num; i++)
+ v4l2_fwnode_put_link(&connector->links[i]);
+ kfree(connector->links);
+err_put_fwnode:
+ fwnode_handle_put(remote_pp);
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(v4l2_fwnode_connector_alloc_parse);
+
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 e39c198882fc..235c7214be3c 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -278,6 +278,44 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
*/
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
+/**
+ * v4l2_fwnode_connector_free() - free the V4L2 connector acquired by
+ * v4l2_fwnode_parse_connector()
+ * @connector: the V4L2 connector the resources of which are to be released
+ *
+ * Drop references to the connection link partners and free the memory allocated
+ * by v4l2_fwnode_parse_connector() call.
+ *
+ * It is safe to call this function with NULL argument or on a V4L2 connector
+ * the parsing of which failed.
+ */
+void v4l2_fwnode_connector_free(struct v4l2_fwnode_connector *connector);
+
+/**
+ * v4l2_fwnode_parse_connector() - parse the connector on endpoint
+ * @fwnode: pointer to the endpoint's fwnode handle where the connector is
+ * connected to
+ * @connector: pointer to the V4L2 fwnode connector data structure
+ *
+ * Fill the connector data structure with the connector type, label, all found
+ * links between the host and the connector as well as connector specific data.
+ * Since the label is optional it can be %NULL if no one was found.
+ *
+ * A reference is taken to both the connector and the connector destination
+ * where the connector belongs to. This must be dropped when no longer needed.
+ * Also the memory it has allocated to store the variable size data must be
+ * freed. Both dropping the references and freeing the memory is done by
+ * v4l2_fwnode_connector_free().
+ *
+ * Return:
+ * * %0 on success or a negative error code on failure:
+ * * %-ENOMEM if memory allocation failed
+ * * %-ENOLINK if the connector can't be found
+ * * %-EINVAL on parsing failure
+ */
+int v4l2_fwnode_connector_alloc_parse(struct fwnode_handle *fwnode,
+ struct v4l2_fwnode_connector *connector);
+
/**
* typedef parse_endpoint_func - Driver's callback function to be called on
* each V4L2 fwnode endpoint.
--
2.20.1
next prev parent reply other threads:[~2019-08-15 11:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 11:57 [PATCH v7 00/13] Add TVP5150 features Marco Felsch
2019-08-15 11:57 ` [PATCH v7 01/13] dt-bindings: connector: analog: add tv norms property Marco Felsch
2019-08-16 11:11 ` Hans Verkuil
2019-08-19 8:09 ` Marco Felsch
2019-08-19 8:18 ` Marco Felsch
2019-08-19 8:41 ` Hans Verkuil
2019-08-19 8:39 ` Hans Verkuil
2019-08-19 9:01 ` Marco Felsch
2019-08-19 9:06 ` Hans Verkuil
2019-08-15 11:57 ` [PATCH v7 02/13] media: v4l2-fwnode: add v4l2_fwnode_connector Marco Felsch
2019-08-16 10:59 ` Hans Verkuil
2019-08-19 9:17 ` Marco Felsch
2019-08-19 9:18 ` Hans Verkuil
2019-08-15 11:57 ` Marco Felsch [this message]
2019-08-15 11:57 ` [PATCH v7 04/13] partial revert of "[media] tvp5150: add HW input connectors support" Marco Felsch
2019-08-15 11:57 ` [PATCH v7 05/13] media: tvp5150: add input source selection of_graph support Marco Felsch
2019-08-19 6:20 ` Marco Felsch
2019-08-15 11:57 ` [PATCH v7 06/13] media: dt-bindings: tvp5150: Add input port connectors DT bindings Marco Felsch
2019-08-16 21:01 ` Rob Herring
2019-08-15 11:57 ` [PATCH v7 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers Marco Felsch
2019-08-16 11:27 ` Hans Verkuil
2019-08-19 10:40 ` Marco Felsch
2019-08-19 10:41 ` Hans Verkuil
2019-08-15 11:57 ` [PATCH v7 08/13] media: tvp5150: initialize subdev before parsing device tree Marco Felsch
2019-08-15 11:57 ` [PATCH v7 09/13] media: tvp5150: add s_power callback Marco Felsch
2019-08-15 11:57 ` [PATCH v7 10/13] media: dt-bindings: tvp5150: cleanup bindings stlye Marco Felsch
2019-08-16 11:28 ` Hans Verkuil
2019-08-15 11:57 ` [PATCH v7 11/13] media: dt-bindings: tvp5150: add optional tvnorms documentation Marco Felsch
2019-08-15 11:57 ` [PATCH v7 12/13] media: tvp5150: add support to limit tv norms on connector Marco Felsch
2019-08-15 11:57 ` [PATCH v7 13/13] media: tvp5150: make debug output more readable Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190815115747.24018-4-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=hans.verkuil@cisco.com \
--cc=jacopo+renesas@jmondi.org \
--cc=kernel@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).