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

Commit de2fb698 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

[media] saa7164: Adding support for HVR2200 card id 0x8953 



Thanks to Greg Tangey for prompting me to merge this.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9637433c

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

+62 −0
Original line number Diff line number Diff line
@@ -447,6 +447,62 @@ struct saa7164_board saa7164_boards[] = { 
			.i2c_reg_len	= REGLEN_8bit,

		} },

	},

	[SAA7164_BOARD_HAUPPAUGE_HVR2200_5] = {

		.name		= "Hauppauge WinTV-HVR2200",

		.porta		= SAA7164_MPEG_DVB,

		.portb		= SAA7164_MPEG_DVB,

		.chiprev	= SAA7164_CHIP_REV3,

		.unit		= {{

			.id		= 0x23,

			.type		= SAA7164_UNIT_EEPROM,

			.name		= "4K EEPROM",

			.i2c_bus_nr	= SAA7164_I2C_BUS_0,

			.i2c_bus_addr	= 0xa0 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		}, {

			.id		= 0x04,

			.type		= SAA7164_UNIT_TUNER,

			.name		= "TDA18271-1",

			.i2c_bus_nr	= SAA7164_I2C_BUS_1,

			.i2c_bus_addr	= 0xc0 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		}, {

			.id		= 0x05,

			.type		= SAA7164_UNIT_ANALOG_DEMODULATOR,

			.name		= "TDA8290-1",

			.i2c_bus_nr	= SAA7164_I2C_BUS_1,

			.i2c_bus_addr	= 0x84 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		}, {

			.id		= 0x21,

			.type		= SAA7164_UNIT_TUNER,

			.name		= "TDA18271-2",

			.i2c_bus_nr	= SAA7164_I2C_BUS_2,

			.i2c_bus_addr	= 0xc0 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		}, {

			.id		= 0x22,

			.type		= SAA7164_UNIT_ANALOG_DEMODULATOR,

			.name		= "TDA8290-2",

			.i2c_bus_nr	= SAA7164_I2C_BUS_2,

			.i2c_bus_addr	= 0x84 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		}, {

			.id		= 0x24,

			.type		= SAA7164_UNIT_DIGITAL_DEMODULATOR,

			.name		= "TDA10048-1",

			.i2c_bus_nr	= SAA7164_I2C_BUS_1,

			.i2c_bus_addr	= 0x10 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		}, {

			.id		= 0x25,

			.type		= SAA7164_UNIT_DIGITAL_DEMODULATOR,

			.name		= "TDA10048-2",

			.i2c_bus_nr	= SAA7164_I2C_BUS_2,

			.i2c_bus_addr	= 0x12 >> 1,

			.i2c_reg_len	= REGLEN_8bit,

		} },

	},

};

const unsigned int saa7164_bcount = ARRAY_SIZE(saa7164_boards);
@@ -490,6 +546,10 @@ struct saa7164_subid saa7164_subids[] = { 
		.subvendor = 0x0070,

		.subdevice = 0x8940,

		.card      = SAA7164_BOARD_HAUPPAUGE_HVR2200_4,

	}, {

		.subvendor = 0x0070,

		.subdevice = 0x8953,

		.card      = SAA7164_BOARD_HAUPPAUGE_HVR2200_5,

	},

};

const unsigned int saa7164_idcount = ARRAY_SIZE(saa7164_subids);
@@ -534,6 +594,7 @@ void saa7164_gpio_setup(struct saa7164_dev *dev) 
	case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_5:

	case SAA7164_BOARD_HAUPPAUGE_HVR2250:

	case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:

	case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
@@ -615,6 +676,7 @@ void saa7164_card_setup(struct saa7164_dev *dev) 
	case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_5:

	case SAA7164_BOARD_HAUPPAUGE_HVR2250:

	case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:

	case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:

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

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ int saa7164_dvb_register(struct saa7164_port *port) 
	case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:

	case SAA7164_BOARD_HAUPPAUGE_HVR2200_5:

		i2c_bus = &dev->i2c_bus[port->nr + 1];

		switch (port->nr) {

		case 0:

drivers/media/video/saa7164/saa7164.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#define SAA7164_BOARD_HAUPPAUGE_HVR2250_2	7

#define SAA7164_BOARD_HAUPPAUGE_HVR2250_3	8

#define SAA7164_BOARD_HAUPPAUGE_HVR2200_4	9

#define SAA7164_BOARD_HAUPPAUGE_HVR2200_5	10



#define SAA7164_MAX_UNITS		8

#define SAA7164_TS_NUMBER_OF_LINES	312