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

Commit 6c362c8e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (6476): Add support for analog tv on HVR-950 



This patch adds USB ID for HVR-950. It also adds the callback for handling
firmware loading.

Thanks to Markus Reichberger for the reset commands.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1808a698

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

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ struct usb_device_id em28xx_id_table [] = { 
	{ USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },

	{ USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },

	{ USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },

	{ USB_DEVICE(0x2040, 0x6513), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },

	{ USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },

	{ USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },

	{ },

drivers/media/video/em28xx/em28xx-i2c.c

+23 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/video_decoder.h>



#include "em28xx.h"

#include "tuner-xc2028.h"

#include <media/v4l2-common.h>

#include <media/tuner.h>
@@ -391,6 +392,26 @@ static u32 functionality(struct i2c_adapter *adap) 
}





static int em28xx_tuner_callback(void *ptr, int command, int arg)

{

	int rc = 0;

	struct em28xx *dev = ptr;



	if (dev->tuner_type != TUNER_XC2028)

		return 0;



	switch (command) {

	case XC2028_TUNER_RESET:

		/* FIXME: This is device-dependent */

		dev->em28xx_write_regs_req(dev, 0x00, 0x48, "\x00", 1);

		dev->em28xx_write_regs_req(dev, 0x00, 0x12, "\x67", 1);



		msleep(140);

		break;

	}

	return rc;

}



static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client)

{

	struct em28xx *dev = client->adapter->algo_data;
@@ -400,6 +421,8 @@ static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client) 
		tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;

		tun_setup.type = dev->tuner_type;

		tun_setup.addr = dev->tuner_addr;

		tun_setup.tuner_callback = em28xx_tuner_callback;



		em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);

	}