2017-02-09 16:23 GMT+01:00 Sekhar Nori <nsekhar@xxxxxx>: > On Tuesday 07 February 2017 11:51 PM, Kevin Hilman wrote: >> Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> writes: >> >>> When we enable vpif capture on the da850-evm we hit a BUG_ON() because >>> the i2c adapter can't be found. The board file boot uses i2c adapter 1 >>> but in the DT mode it's actually adapter 0. Drop the problematic lines. >>> >>> Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> >>> --- >>> arch/arm/mach-davinci/pdata-quirks.c | 4 ---- >>> 1 file changed, 4 deletions(-) >>> >>> diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c >>> index 94948c1..09f62ac 100644 >>> --- a/arch/arm/mach-davinci/pdata-quirks.c >>> +++ b/arch/arm/mach-davinci/pdata-quirks.c >>> @@ -116,10 +116,6 @@ static void __init da850_vpif_legacy_init(void) >>> if (of_machine_is_compatible("ti,da850-lcdk")) >>> da850_vpif_capture_config.subdev_count = 1; >>> >>> - /* EVM (UI card) uses i2c adapter 1 (not default: zero) */ >>> - if (of_machine_is_compatible("ti,da850-evm")) >>> - da850_vpif_capture_config.i2c_adapter_id = 1; >>> - >> >> oops, my bad. >> >> Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxx> > > The offending code is not in my master branch. Since its almost certain > that VPIF platform support is going to wait for v4.12, can you or Kevin > please update Kevin's original patches with these fixes rolled in? > > Thanks, > Sekhar > Sure, I based my series on Kevin's integration branch for 4.10. Thanks, Bartosz -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html