Hi Mauro, Thank you for the patch.
On Saturday 03 January 2015 18:09:33 Mauro Carvalho Chehab wrote: > Properly initialize tuner core subdev at the media controller. > > That requires a new subtype at the media controller API. > > Signed-off-by: Mauro Carvalho Chehab <[email protected]> > > diff --git a/drivers/media/v4l2-core/tuner-core.c > b/drivers/media/v4l2-core/tuner-core.c index 559f8372e2eb..114715ed0110 > 100644 > --- a/drivers/media/v4l2-core/tuner-core.c > +++ b/drivers/media/v4l2-core/tuner-core.c > @@ -134,6 +134,9 @@ struct tuner { > unsigned int type; /* chip type id */ > void *config; > const char *name; > +#if defined(CONFIG_MEDIA_CONTROLLER) > + struct media_pad pad; > +#endif I'm not too familiar with tuners, do they all have a single output only and no input ? > }; > > /* > @@ -434,6 +437,8 @@ static void set_type(struct i2c_client *c, unsigned int > type, t->name = analog_ops->info.name; > } > > + t->sd.entity.name = t->name; > + Entity information is not supposed to change at runtime, I'm not sure to be comfortable with this change. set_type() is called at probe time and in tuner_s_type_addr(). The former just duplicates the name initialization in tuner_probe(), so isn't really needed. The later bothers me. > tuner_dbg("type set to %s\n", t->name); > > t->mode_mask = new_mode_mask; > @@ -592,6 +597,7 @@ static int tuner_probe(struct i2c_client *client, > struct tuner *t; > struct tuner *radio; > struct tuner *tv; > + int ret; > > t = kzalloc(sizeof(struct tuner), GFP_KERNEL); > if (NULL == t) > @@ -696,6 +702,15 @@ register_client: > t->type, > t->mode_mask & T_RADIO ? " Radio" : "", > t->mode_mask & T_ANALOG_TV ? " TV" : ""); > +#if defined(CONFIG_MEDIA_CONTROLLER) > + t->pad.flags = MEDIA_PAD_FL_SOURCE; > + t->sd.entity.type = MEDIA_ENT_T_V4L2_SUBDEV_TUNER; > + t->sd.entity.name = t->name; v4l2_subdev_init(), called by v4l2_i2c_subdev_init(), sets sd->entity.name to point to sd->name. Is there a reason why the subdev name can't be used as the entity name ? > + > + ret = media_entity_init(&t->sd.entity, 1, &t->pad, 0); > + if (ret < 0) > + tuner_err("failed to initialize media entity!\n"); > +#endif > return 0; > } > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index 707db275f92b..5ffde035789b 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -66,6 +66,8 @@ struct media_device_info { > /* A converter of analogue video to its digital representation. */ > #define MEDIA_ENT_T_V4L2_SUBDEV_DECODER (MEDIA_ENT_T_V4L2_SUBDEV + 4) > > +#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER (MEDIA_ENT_T_V4L2_SUBDEV + 5) > + > #define MEDIA_ENT_FL_DEFAULT (1 << 0) > > struct media_entity_desc { -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
