| Message ID | 1469178554-20719-2-git-send-email-ulrich.hecht+renesas@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/22/2016 12:09 PM, Ulrich Hecht wrote: > Fall back to input 0 if "default-input" property is not present. > > Additionally, documentation in commit bf9c82278c34 ("[media] > media: adv7604: ability to read default input port from DT") 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 <william.towle@codethink.co.uk>. > > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > --- > 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; of_property_read_u32(np, "default-input", &state->pdata.default_input)); should be equivalent... MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
Fall back to input 0 if "default-input" property is not present. Additionally, documentation in commit bf9c82278c34 ("[media] media: adv7604: ability to read default input port from DT") 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 <william.towle@codethink.co.uk>. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- drivers/media/i2c/adv7604.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)