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
Cc: p.zabel@pengutronix.de, javierm@redhat.co,
laurent.pinchart@ideasonboard.com, linux-media@vger.kernel.org,
devicetree@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH v5 03/13] media: v4l2-fwnode: add initial connector parsing support
Date: Fri, 5 Apr 2019 08:03:07 +0200 [thread overview]
Message-ID: <20190405060317.11240-4-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20190405060317.11240-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/
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 | 113 ++++++++++++++++++++++++++
include/media/v4l2-fwnode.h | 16 ++++
2 files changed, 129 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 20571846e636..a6bbe42ca518 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -592,6 +592,119 @@ 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 *name;
+} connectors[] = {
+ {
+ .type = V4L2_CON_COMPOSITE,
+ .name = "composite-video-connector",
+ }, {
+ .type = V4L2_CON_SVIDEO,
+ .name = "svideo-connector",
+ }, {
+ .type = V4L2_CON_VGA,
+ .name = "vga-connector",
+ }, {
+ .type = V4L2_CON_DVI,
+ .name = "dvi-connector",
+ }, {
+ .type = V4L2_CON_HDMI,
+ .name = "hdmi-connector"
+ }
+};
+
+static enum v4l2_connector_type
+v4l2_fwnode_string_to_connector_type(const char *con_str)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(connectors); i++)
+ if (!strcmp(con_str, connectors[i].name))
+ return connectors[i].type;
+
+ /* no valid connector found */
+ 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);
+
+ /* set it to V4L2_STD_ALL in case of not specified tvnorms */
+ vc->connector.analog.supported_tvnorms = ret ? V4L2_STD_ALL : tvnorms;
+ return 0;
+}
+
+int v4l2_fwnode_parse_connector(struct fwnode_handle *__fwnode,
+ struct v4l2_fwnode_connector *connector)
+{
+ struct fwnode_handle *fwnode;
+ struct fwnode_endpoint __ep;
+ const char *c_type_str, *label;
+ int ret;
+
+ memset(connector, 0, sizeof(*connector));
+
+ fwnode = fwnode_graph_get_remote_port_parent(__fwnode);
+
+ /* 1st parse all common properties */
+ /* connector-type is stored within the compatible string */
+ ret = fwnode_property_read_string(fwnode, "compatible", &c_type_str);
+ if (ret)
+ return -EINVAL;
+
+ connector->type = v4l2_fwnode_string_to_connector_type(c_type_str);
+
+ fwnode_graph_parse_endpoint(__fwnode, &__ep);
+ connector->remote_port = __ep.port;
+ connector->remote_id = __ep.id;
+
+ ret = fwnode_property_read_string(fwnode, "label", &label);
+ if (!ret) {
+ /* ensure label doesn't exceed V4L2_CONNECTOR_MAX_LABEL size */
+ strscpy(connector->label, label, V4L2_CONNECTOR_MAX_LABEL);
+ } else {
+ /*
+ * labels are optional, if no one is given create one:
+ * <connector-type-string>@port<endpoint_port>/ep<endpoint_id>
+ */
+ snprintf(connector->label, V4L2_CONNECTOR_MAX_LABEL,
+ "%s@port%u/ep%u", c_type_str, connector->remote_port,
+ connector->remote_id);
+ }
+
+ /* now parse the connector specific properties */
+ switch (connector->type) {
+ /* fall through */
+ case V4L2_CON_COMPOSITE:
+ case V4L2_CON_SVIDEO:
+ ret = v4l2_fwnode_connector_parse_analog(fwnode, connector);
+ break;
+ /* fall through */
+ case V4L2_CON_VGA:
+ case V4L2_CON_DVI:
+ case V4L2_CON_HDMI:
+ pr_warn("Connector specific parsing is currently not supported for %s\n",
+ c_type_str);
+ ret = 0;
+ break;
+ /* fall through */
+ case V4L2_CON_UNKNOWN:
+ default:
+ pr_err("Unknown connector type\n");
+ ret = -EINVAL;
+ };
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(v4l2_fwnode_parse_connector);
+
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 04344b71656f..aa8bbef8589b 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -269,6 +269,22 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
*/
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
+/**
+ * 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 and the
+ * endpoint id and port where the connector belongs to. If no label is present
+ * a unique one will be created. Labels with more than 40 characters are cut.
+ *
+ * Return: %0 on success or a negative error code on failure:
+ * %-EINVAL on parsing failure
+ */
+int v4l2_fwnode_parse_connector(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-04-05 6:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 6:03 [PATCH v5 00/13] TVP5150 new features Marco Felsch
2019-04-05 6:03 ` [PATCH v5 01/13] dt-bindings: connector: analog: add tv norms property Marco Felsch
2019-04-12 12:14 ` Hans Verkuil
2019-04-12 13:00 ` Marco Felsch
2019-04-05 6:03 ` [PATCH v5 02/13] media: v4l2-fwnode: add v4l2_fwnode_connector Marco Felsch
2019-04-05 12:43 ` Jacopo Mondi
2019-04-10 9:51 ` Marco Felsch
2019-04-12 12:17 ` Hans Verkuil
2019-04-12 13:05 ` Marco Felsch
2019-04-05 6:03 ` Marco Felsch [this message]
2019-04-05 13:06 ` [PATCH v5 03/13] media: v4l2-fwnode: add initial connector parsing support Jacopo Mondi
2019-04-10 10:31 ` Marco Felsch
2019-04-05 6:03 ` [PATCH v5 04/13] partial revert of "[media] tvp5150: add HW input connectors support" Marco Felsch
2019-04-05 6:03 ` [PATCH v5 05/13] media: tvp5150: add input source selection of_graph support Marco Felsch
2019-04-05 14:45 ` Jacopo Mondi
2019-04-10 14:04 ` Marco Felsch
2019-04-05 6:03 ` [PATCH v5 06/13] media: dt-bindings: tvp5150: Add input port connectors DT bindings Marco Felsch
2019-04-05 6:03 ` [PATCH v5 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers Marco Felsch
2019-04-05 6:03 ` [PATCH v5 08/13] media: tvp5150: initialize subdev before parsing device tree Marco Felsch
2019-04-05 6:03 ` [PATCH v5 09/13] media: tvp5150: add s_power callback Marco Felsch
2019-04-05 6:03 ` [PATCH v5 10/13] media: dt-bindings: tvp5150: cleanup bindings stlye Marco Felsch
2019-04-06 7:09 ` Rob Herring
2019-04-05 6:03 ` [PATCH v5 11/13] media: dt-bindings: tvp5150: add optional tvnorms documentation Marco Felsch
2019-04-06 7:10 ` Rob Herring
2019-04-05 6:03 ` [PATCH v5 12/13] media: tvp5150: add support to limit tv norms on connector Marco Felsch
2019-04-05 6:03 ` [PATCH v5 13/13] media: tvp5150: make debug output more readable Marco Felsch
2019-04-06 11:19 ` [PATCH v5 00/13] TVP5150 new features Mauro Carvalho Chehab
2019-04-10 15:47 ` 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=20190405060317.11240-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=javierm@redhat.co \
--cc=kernel@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--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).