On 02/16/2015 12:11 PM, Mauro Carvalho Chehab wrote: > Em Mon, 16 Feb 2015 10:11:59 +0100 > Hans Verkuil <hverkuil@xxxxxxxxx> escreveu: > >> On 02/13/2015 11:57 PM, Mauro Carvalho Chehab wrote: >>> Instead of keeping the media controller entity not initialized, >>> fill it and create the pads for cx25840. >>> >>> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> >>> >>> diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c >>> index 573e08826b9b..bdb5bb6b58da 100644 >>> --- a/drivers/media/i2c/cx25840/cx25840-core.c >>> +++ b/drivers/media/i2c/cx25840/cx25840-core.c >>> @@ -5137,6 +5137,9 @@ static int cx25840_probe(struct i2c_client *client, >>> int default_volume; >>> u32 id; >>> u16 device_id; >>> +#if defined(CONFIG_MEDIA_CONTROLLER) >>> + int ret; >>> +#endif >>> >>> /* Check if the adapter supports the needed features */ >>> if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) >>> @@ -5178,6 +5181,21 @@ static int cx25840_probe(struct i2c_client *client, >>> >>> sd = &state->sd; >>> v4l2_i2c_subdev_init(sd, client, &cx25840_ops); >>> +#if defined(CONFIG_MEDIA_CONTROLLER) >>> + /* TODO: need to represent analog inputs too */ >> >> Which analog inputs? Do you mean 'audio inputs' instead? > > I mean analog video inputs like composite, svideo, etc, e. g. > having multiple input pads for the analog demods, like: > > ___________ > TUNER --------> | | > | | > SVIDEO .......> | cx25840 | > | | > COMPOSITE1 ...> |_________| > > > (in the above, dashes represent the enabled link, and periods > represent the disabled ones) > > In other words, if we want to properly represent the pipeline, > it should be possible to see via the media controller if the tuner > is being used as an image source, or if the source is something else. > > I didn't map those other inputs here yet, due to a few things: > - Not sure if it is really worth > - The extra inputs would require subdevs that won't be controlled > - I was in doubt about the best way for doing that > - That would likely require some extra setup for cx25840 caller > drivers, in order to represent what of the possible internal > inputs are actually used on each specific board > - I was too lazy to do it ;) > > Actually, I didn't see much benefit on adding such map now, so I > decided to just add a comment inside the source code. OK, fair enough, I'd have done the same. But if you could extend the comment to include what you just said, then that will be helpful in the future. Thanks! Hans -- 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
