Commit 8b0a81c7 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] si2157: register as a tuner entity 



As this tuner doesn't use the usual subdev interface, we need
to register it manually.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 08f49200

drivers/media/tuners/si2157.c

+31 −1
Original line number Diff line number Diff line
@@ -438,6 +438,31 @@ static int si2157_probe(struct i2c_client *client, 
	memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops));

	fe->tuner_priv = client;



#ifdef CONFIG_MEDIA_CONTROLLER

	if (cfg->mdev) {

		dev->mdev = cfg->mdev;



		dev->ent.name = KBUILD_MODNAME;

		dev->ent.function = MEDIA_ENT_F_TUNER;



		dev->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;

		dev->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;

		dev->pad[TUNER_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;



		ret = media_entity_pads_init(&dev->ent, TUNER_NUM_PADS,

					     &dev->pad[0]);



		if (ret)

			goto err_kfree;



		ret = media_device_register_entity(cfg->mdev, &dev->ent);

		if (ret) {

			media_entity_cleanup(&dev->ent);

			goto err_kfree;

		}

	}

#endif



	dev_info(&client->dev, "Silicon Labs %s successfully attached\n",

			dev->chiptype == SI2157_CHIPTYPE_SI2146 ?

			"Si2146" : "Si2147/2148/2157/2158");
@@ -461,6 +486,11 @@ static int si2157_remove(struct i2c_client *client) 
	/* stop statistics polling */

	cancel_delayed_work_sync(&dev->stat_work);



#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	if (dev->mdev)

		media_device_unregister_entity(&dev->ent);

#endif



	memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));

	fe->tuner_priv = NULL;

	kfree(dev);

drivers/media/tuners/si2157.h

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define SI2157_H



#include <linux/kconfig.h>

#include <media/media-device.h>

#include "dvb_frontend.h"



/*
@@ -30,6 +31,10 @@ struct si2157_config { 
	 */

	struct dvb_frontend *fe;



#if defined(CONFIG_MEDIA_CONTROLLER)

	struct media_device *mdev;

#endif



	/*

	 * Spectral Inversion

	 */

drivers/media/tuners/si2157_priv.h

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define SI2157_PRIV_H



#include <linux/firmware.h>

#include <media/v4l2-mc.h>

#include "si2157.h"



/* state struct */
@@ -31,6 +32,13 @@ struct si2157_dev { 
	u8 if_port;

	u32 if_frequency;

	struct delayed_work stat_work;



#if defined(CONFIG_MEDIA_CONTROLLER)

	struct media_device	*mdev;

	struct media_entity	ent;

	struct media_pad	pad[TUNER_NUM_PADS];

#endif



};



#define SI2157_CHIPTYPE_SI2157 0