Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb89cd33 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7413): use tuner-simple for Philips FMD1216ME digital tuning support 



Convert cxusb, cx88-dvb and saa7134-dvb to use tuner-simple instead of
dvb-pll for Philips FMD1216ME

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 827855d3

drivers/media/dvb/dvb-usb/cxusb.c

+3 −2
Original line number Diff line number Diff line
@@ -453,8 +453,9 @@ static struct mt352_config cxusb_mt352_xc3028_config = { 
/* Callbacks for DVB USB */

static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)

{

	dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,

		   DVB_PLL_FMD1216ME);

	dvb_attach(simple_tuner_attach, adap->fe,

		   &adap->dev->i2c_adap, 0x61,

		   TUNER_PHILIPS_FMD1216ME_MK3);

	return 0;

}

drivers/media/video/cx88/cx88-dvb.c

+6 −4
Original line number Diff line number Diff line
@@ -525,8 +525,9 @@ static int dvb_register(struct cx8802_dev *dev) 
					       &hauppauge_hvr_config,

					       &dev->core->i2c_adap);

		if (dev->dvb.frontend != NULL) {

			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,

				   &dev->core->i2c_adap, DVB_PLL_FMD1216ME);

			dvb_attach(simple_tuner_attach, dev->dvb.frontend,

				   &dev->core->i2c_adap, 0x61,

				   TUNER_PHILIPS_FMD1216ME_MK3);

		}

		break;

	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
@@ -593,8 +594,9 @@ static int dvb_register(struct cx8802_dev *dev) 
		dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,

					       &dev->vp3054->adap);

		if (dev->dvb.frontend != NULL) {

			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,

				   &dev->core->i2c_adap, DVB_PLL_FMD1216ME);

			dvb_attach(simple_tuner_attach, dev->dvb.frontend,

				   &dev->core->i2c_adap, 0x61,

				   TUNER_PHILIPS_FMD1216ME_MK3);

		}

#else

		printk(KERN_ERR "%s/2: built without vp3054 support\n", dev->core->name);

drivers/media/video/saa7134/saa7134-dvb.c

+7 −4
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "isl6421.h"

#include "isl6405.h"

#include "lnbp21.h"

#include "tuner-simple.h"



MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");

MODULE_LICENSE("GPL");
@@ -938,8 +939,9 @@ static int dvb_init(struct saa7134_dev *dev) 
					       &medion_cardbus,

					       &dev->i2c_adap);

		if (dev->dvb.frontend) {

			dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,

				   &dev->i2c_adap, DVB_PLL_FMD1216ME);

			dvb_attach(simple_tuner_attach, dev->dvb.frontend,

				   &dev->i2c_adap, medion_cardbus.tuner_address,

				   TUNER_PHILIPS_FMD1216ME_MK3);

		}

		break;

	case SAA7134_BOARD_PHILIPS_TOUGH:
@@ -1108,8 +1110,9 @@ static int dvb_init(struct saa7134_dev *dev) 
			dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;

			dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;



			dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,

				   &dev->i2c_adap, DVB_PLL_FMD1216ME);

			dvb_attach(simple_tuner_attach, dev->dvb.frontend,

				   &dev->i2c_adap, medion_cardbus.tuner_address,

				   TUNER_PHILIPS_FMD1216ME_MK3);

		}

		break;

	case SAA7134_BOARD_VIDEOMATE_DVBT_200A: