Put the data-lanes property parsing code and make a separate function
out of it, so it can be used in drivers that don't need all features
packed in v4l2_of_parse_link().
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
drivers/media/v4l2-core/v4l2-of.c | 48 ++++++++++++++++++++++++-------------
include/media/v4l2-of.h | 28 ++++++++++++++++------
2 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-of.c b/drivers/media/v4l2-core/v4l2-of.c
index 4e6658c..032ee67 100644
--- a/drivers/media/v4l2-core/v4l2-of.c
+++ b/drivers/media/v4l2-core/v4l2-of.c
@@ -15,6 +15,35 @@
#include <media/v4l2-of.h>
+
+/**
+ * v4l2_of_parse_data_lanes() - parse data-lanes property
+ * @node: a node containing data-lanes property [in]
+ * @mipi_csi2: data lanes configuration [out]
+ *
+ * Return: 0 on success or negative error value otherwise.
+ */
+int v4l2_of_parse_data_lanes(const struct device_node *node,
+ struct v4l2_of_mipi_csi2 *mipi_csi2)
+{
+ struct property *prop = of_find_property(node, "data-lanes", NULL);
+ u32 data_lanes[ARRAY_SIZE(mipi_csi2->data_lanes)];
+ const __be32 *lane = NULL;
+ int i = 0;
+
+ if (!prop)
+ return -EINVAL;
+
+ do {
+ lane = of_prop_next_u32(prop, lane, &data_lanes[i]);
+ } while (lane && i++ < ARRAY_SIZE(data_lanes));
+
+ mipi_csi2->num_data_lanes = i;
+ while (i--)
+ mipi_csi2->data_lanes[i] = data_lanes[i];
+ return 0;
+}
+
/*
* All properties are optional. If none are found, we don't set any flags. This
* means, the port has a static configuration and no properties have to be
@@ -29,11 +58,9 @@ void v4l2_of_parse_link(const struct device_node *node,
struct v4l2_of_link *link)
{
const struct device_node *port_node = of_get_parent(node);
+ bool data_lanes_present = false;
int size;
unsigned int v;
- u32 data_lanes[ARRAY_SIZE(link->mipi_csi_2.data_lanes)];
- bool data_lanes_present;
- struct property *prop;
memset(link, 0, sizeof(*link));
@@ -84,21 +111,8 @@ void v4l2_of_parse_link(const struct device_node *node,
if (!of_property_read_u32(node, "clock-lanes", &v))
link->mipi_csi_2.clock_lane = v;
- prop = of_find_property(node, "data-lanes", NULL);
- if (prop) {
- int i = 0;
- const __be32 *lane = NULL;
- do {
- lane = of_prop_next_u32(prop, lane, &data_lanes[i]);
- } while (lane && i++ < ARRAY_SIZE(data_lanes));
-
- link->mipi_csi_2.num_data_lanes = i;
- while (i--)
- link->mipi_csi_2.data_lanes[i] = data_lanes[i];
+ if (!v4l2_of_parse_data_lanes(node, &link->mipi_csi_2))
data_lanes_present = true;
- } else {
- data_lanes_present = false;
- }
if (of_get_property(node, "clock-noncontinuous", &size))
link->mbus_flags |= V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK;
diff --git a/include/media/v4l2-of.h b/include/media/v4l2-of.h
index ccb1ebe..9b036e6 100644
--- a/include/media/v4l2-of.h
+++ b/include/media/v4l2-of.h
@@ -13,11 +13,18 @@
#include <linux/list.h>
#include <linux/types.h>
+#include <linux/errno.h>
#include <media/v4l2-mediabus.h>
struct device_node;
+struct v4l2_of_mipi_csi2 {
+ unsigned char data_lanes[4];
+ unsigned char clock_lane;
+ unsigned short num_data_lanes;
+};
+
struct v4l2_of_link {
unsigned int port;
unsigned int addr;
@@ -30,17 +37,15 @@ struct v4l2_of_link {
unsigned char bus_width;
unsigned char data_shift;
} parallel;
- struct {
- unsigned char data_lanes[4];
- unsigned char clock_lane;
- unsigned short num_data_lanes;
- } mipi_csi_2;
+ struct v4l2_of_mipi_csi2 mipi_csi_2;
};
};
#ifdef CONFIG_OF
void v4l2_of_parse_link(const struct device_node *node,
struct v4l2_of_link *link);
+int v4l2_of_parse_data_lanes(const struct device_node *node,
+ struct v4l2_of_mipi_csi2 *mipi_csi2);
struct device_node *v4l2_of_get_next_link(const struct device_node *parent,
struct device_node *previous);
struct device_node *v4l2_of_get_remote(const struct device_node *node);
@@ -49,15 +54,24 @@ static inline void v4l2_of_parse_link(const struct device_node *node,
struct v4l2_of_link *link)
{
}
+
+static inline int v4l2_of_parse_data_lanes(const struct device_node *node,
+ struct v4l2_of_mipi_csi2 *mipi_csi2)
+{
+ return -ENOSYS;
+}
+
static inline struct device_node *v4l2_of_get_next_link(const struct device_node *parent,
struct device_node *previous)
{
return NULL;
}
+
static inline struct device_node *v4l2_of_get_remote(const struct device_node *node)
{
return NULL;
}
-#endif
-#endif
+#endif /* CONFIG_OF */
+
+#endif /* _V4L2_OF_H */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
