@@ -595,6 +595,139 @@ 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_CONN_COMPOSITE,
+ .compatible = "composite-video-connector",
+ }, {
+ .type = V4L2_CONN_SVIDEO,
+ .compatible = "svideo-connector",
+ }, {
+ .type = V4L2_CONN_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_CONN_UNKNOWN;
+}
+
+static int
+v4l2_fwnode_connector_parse_analog(struct fwnode_handle *fwnode,
+ struct v4l2_fwnode_connector *vc)
+{
+ u32 stds;
+ int ret;
+
+ ret = fwnode_property_read_u32(fwnode, "sdtv-standards", &stds);
+
+ /* The property is optional. */
+ vc->connector.analog.sdtv_stds = ret ? V4L2_STD_ALL : stds;
+
+ 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_CONN_COMPOSITE:
+ case V4L2_CONN_SVIDEO:
+ err = v4l2_fwnode_connector_parse_analog(remote_pp, connector);
+ break;
+ case V4L2_CONN_HDMI:
+ case V4L2_CONN_UNKNOWN:
+ default:
+ pr_err("Unknown connector type or parsing not supported\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,
@@ -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.
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/ v8: - V4L2_CON_* -> V4L2_CONN_* - tvnorms -> sdtv-standards - adapt to new v4l2_fwnode_connector_analog member - return error in case of V4L2_CONN_HDMI 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 | 133 ++++++++++++++++++++++++++ include/media/v4l2-fwnode.h | 38 ++++++++ 2 files changed, 171 insertions(+)