Hi Marco, Apologies for the delay. On Wed, Oct 02, 2019 at 10:07:35AM +0200, Marco Felsch wrote: > Hi Sakari, > > On 19-10-02 10:03, Sakari Ailus wrote: > > Hi Marco, > > > > On Fri, Aug 30, 2019 at 12:16:35PM +0200, Marco Felsch wrote: > > > 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@xxxxxxxxxxxxxx> > > > --- > > > [1] https://patchwork.kernel.org/cover/10794703/ > > > > > > v10: > > > - drop V4L2_CONN_HDMI support > > > - adapt pr_err msg to reflect new state (-> connector is unkown) > > > > > > v9: > > > - Fix leading semicolon found by kbuild semicolon.cocci > > > > > > 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 | 129 ++++++++++++++++++++++++++ > > > include/media/v4l2-fwnode.h | 38 ++++++++ > > > 2 files changed, 167 insertions(+) > > > > > > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c > > > index 3bd1888787eb..0bfa7cbf78df 100644 > > > --- a/drivers/media/v4l2-core/v4l2-fwnode.c > > > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c > > > @@ -595,6 +595,135 @@ 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", > > > + }, > > > +}; > > > + > > > +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); > > > > Please assign connector->links NULL here, and nr_of_links to zero. > > Okay, I can do that. > > > > +} > > > +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); > > > > How do you know a remote endpoint is a connector, and not another device's > > endpoint? > > Well, I think that the caller won't use this function if it isn't a > connector. If it helps I can check if the compatible of the remote ends > with "-connector". The function is called by a driver. A driver shouldn't know what's at the other end of the graph arc; the information should come from the firmware instead. On some board there could be another device where you have a connector now. As the connector has its own compatible string, there could be a connector driver to tell this is actually a connector, even if there's nothing to control. It'd be a very tiny driver. -- Regards, Sakari Ailus
