Thread (6 messages) 6 messages, 3 authors, 2016-09-22
STALE3581d

[PATCH 2/2] media: adv7604: automatic "default-input" selection

From: Ulrich Hecht <hidden>
Date: 2016-09-16 09:39:42
Also in: linux-media, linux-renesas-soc
Subsystem: analog devices inc adv7604 driver, media input infrastructure (v4l/dvb), the rest · Maintainers: Hans Verkuil, Mauro Carvalho Chehab, Linus Torvalds

Fall back to input 0 if "default-input" property is not present.

Documentation states that the "default-input" property should reside
directly in the node for adv7612.  Hence, also adjust the parsing to make
the implementation consistent with this.

Based on patch by William Towle [off-list ref].

Signed-off-by: Ulrich Hecht <redacted>
Signed-off-by: Hans Verkuil <redacted>
---
 drivers/media/i2c/adv7604.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 4003831..055c9df 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3077,10 +3077,13 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
 	if (!of_property_read_u32(endpoint, "default-input", &v))
 		state->pdata.default_input = v;
 	else
-		state->pdata.default_input = -1;
+		state->pdata.default_input = 0;
 
 	of_node_put(endpoint);
 
+	if (!of_property_read_u32(np, "default-input", &v))
+		state->pdata.default_input = v;
+
 	flags = bus_cfg.bus.parallel.flags;
 
 	if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
-- 
2.9.3
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help