Linux drivers can make use of devm_drm_of_get_bridge to get a handle on
the next bridge. Add similar functionality to barebox as well.
Signed-off-by: Ahmad Fatoum <a.fat...@barebox.org>
---
drivers/video/vpl.c | 60 ++++++++++++++++++++++++++++++++++++++++++---
include/video/vpl.h | 15 ++++++++++++
2 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/drivers/video/vpl.c b/drivers/video/vpl.c
index da8bd93b7d6a..0235c1e790bd 100644
--- a/drivers/video/vpl.c
+++ b/drivers/video/vpl.c
@@ -53,14 +53,15 @@ struct vpl *of_vpl_get(struct device_node *node, int port)
return of_find_vpl(node);
}
-static int vpl_foreach_endpoint(struct vpl *vpl, unsigned int port,
+static int vpl_foreach_endpoint(struct vpl *vpl, unsigned int port, int
endpoint_id,
int (*fn)(struct vpl *, unsigned port, void
*data),
void *data)
{
struct device_node *node, *endpoint;
int ret;
- pr_debug("%s: %pOF port %d\n", __func__, vpl->node, port);
+ pr_debug("%s: %pOF port %d endpoint %d\n", __func__, vpl->node,
+ port, endpoint_id);
node = of_graph_get_port_by_id(vpl->node, port);
if (!node) {
@@ -73,6 +74,16 @@ static int vpl_foreach_endpoint(struct vpl *vpl, unsigned
int port,
struct vpl *remote_vpl;
u32 remote_port_id = 0;
+ if (endpoint_id >= 0) {
+ u32 local_endpoint_id = 0;
+ of_property_read_u32(endpoint, "reg",
&local_endpoint_id);
+ if (local_endpoint_id != endpoint_id) {
+ pr_debug("%s: skipping endpoint %pOF with id
%d\n",
+ __func__, endpoint, local_endpoint_id);
+ continue;
+ }
+ }
+
remote = of_graph_get_remote_port(endpoint);
if (!remote) {
pr_debug("%s: no remote for endpoint %pOF\n", __func__,
endpoint);
@@ -128,5 +139,48 @@ int vpl_ioctl(struct vpl *vpl, unsigned int port,
{
struct vpl_ioctl data = { .cmd = cmd, .ptr = ptr };
- return vpl_foreach_endpoint(vpl, port, vpl_remote_ioctl, &data) ?:
data.err;
+ return vpl_foreach_endpoint(vpl, port, -1, vpl_remote_ioctl, &data) ?:
data.err;
+}
+
+static int vpl_alloc_bridge(struct vpl *vpl, unsigned port, void *_bridge)
+{
+ struct vpl_bridge **bridge = _bridge;
+
+ (*bridge) = malloc(sizeof(**bridge));
+ (*bridge)->vpl = vpl;
+ (*bridge)->port = port;
+
+ return 1;
+}
+
+struct vpl_bridge *devm_vpl_of_get_bridge(struct device *dev, struct
device_node *np,
+ unsigned int port, unsigned int
endpoint)
+{
+ struct vpl_bridge *bridge = NULL;
+ struct vpl *vpl;
+ int ret;
+
+ vpl = of_find_vpl(np);
+ if (!vpl)
+ return ERR_PTR(-EPROBE_DEFER);
+
+ ret = vpl_foreach_endpoint(vpl, port, endpoint, vpl_alloc_bridge,
&bridge);
+ if (ret < 0)
+ return ERR_PTR(ret);
+
+ return bridge ?: ERR_PTR(-EINVAL);
+}
+
+int vpl_bridge_ioctl(struct vpl_bridge *bridge, unsigned int cmd, void *ptr)
+{
+ struct vpl *vpl;
+
+ if (IS_ERR_OR_NULL(bridge))
+ return PTR_ERR_OR_ZERO(bridge);
+
+ vpl = bridge->vpl;
+ if (!vpl->ioctl)
+ return -EOPNOTSUPP;
+
+ return vpl->ioctl(vpl, bridge->port, cmd, ptr);
}
diff --git a/include/video/vpl.h b/include/video/vpl.h
index 5ea3d6dcf202..a8fda3e6294b 100644
--- a/include/video/vpl.h
+++ b/include/video/vpl.h
@@ -20,9 +20,24 @@ struct vpl {
struct list_head list;
};
+/**
+ * struct vpl_bridge - bridge control structure
+ */
+struct vpl_bridge {
+ /** @vpl: pointer to vpl instance of bridge */
+ struct vpl *vpl;
+ /** @port: remote input port on bridge */
+ int port;
+};
+
int vpl_register(struct vpl *);
int vpl_ioctl(struct vpl *, unsigned int port,
unsigned int cmd, void *ptr);
+struct vpl_bridge;
+int vpl_bridge_ioctl(struct vpl_bridge *,
+ unsigned int cmd, void *ptr);
+struct vpl_bridge *devm_vpl_of_get_bridge(struct device *dev, struct
device_node *np,
+ unsigned int port, unsigned int
endpoint);
struct vpl *of_vpl_get(struct device_node *node, int port);
--
2.39.5
