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

Commit cf146ca4 authored by Hartmut Hackmann's avatar Hartmut Hackmann Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board 



This is a analog DVB-T hybrid board

Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6b14ff9e

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -98,3 +98,4 @@ 
 97 -> LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]

 98 -> Proteus Pro 2309                         [0919:2003]

 99 -> AVerMedia TV Hybrid A16AR                [1461:2c00]

100 -> Asus Europa2 OEM                         [1043:4860]

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

+35 −0
Original line number Diff line number Diff line
@@ -2994,6 +2994,34 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE1,

		},

	},

	[SAA7134_BOARD_ASUS_EUROPA2_HYBRID] = {

		.name           = "Asus Europa2 OEM",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT| TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE,

		.mpeg           = SAA7134_MPEG_DVB,

		.inputs = {{

			.name   = name_tv,

			.vmux   = 3,

			.amux   = TV,

			.tv     = 1,

		},{

			.name   = name_comp1,

			.vmux   = 4,

			.amux   = LINE2,

		},{

			.name   = name_svideo,

			.vmux   = 8,

			.amux   = LINE2,

		}},

		.radio = {

			.name   = name_radio,

			.amux   = LINE1,

		},

	},

};



const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3596,6 +3624,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1461,

		.subdevice    = 0x2c00,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_A16AR,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,

		.subvendor    = 0x1043,

		.subdevice    = 0x4860,

		.driver_data  = SAA7134_BOARD_ASUS_EUROPA2_HYBRID,

	},{

		/* --- boards without eeprom + subsystem ID --- */

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3871,6 +3905,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		break;

	case SAA7134_BOARD_PHILIPS_EUROPA:

	case SAA7134_BOARD_VIDEOMATE_DVBT_300:

	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:

		/* The Philips EUROPA based hybrid boards have the tuner connected through

		 * the channel decoder. We have to make it transparent to find it

		 */

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

+12 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,18 @@ static int dvb_init(struct saa7134_dev *dev) 
			}

		}

		break;

	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:

		dev->dvb.frontend = tda10046_attach(&medion_cardbus,

						    &dev->i2c_adap);

		if (dev->dvb.frontend) {

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

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

			dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;

			dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;

			dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;

		}

		break;



	default:

		printk("%s: Huh? unknown DVB card?\n",dev->name);

		break;

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_FLYDVBS_LR300 97

#define SAA7134_BOARD_PROTEUS_2309 98

#define SAA7134_BOARD_AVERMEDIA_A16AR   99

#define SAA7134_BOARD_ASUS_EUROPA2_HYBRID 100



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8