V4L/DVB (13375): cx23885: Add support for Mygica X8558Pro DMB-TH (ea5697fe) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/video4linux/CARDLIST.cx23885

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,3 +25,4 @@
	24 -> Hauppauge WinTV-HVR1850 [0070:8541]		24 -> Hauppauge WinTV-HVR1850 [0070:8541]
	25 -> Compro VideoMate E800 [1858:e800]		25 -> Compro VideoMate E800 [1858:e800]
	26 -> Hauppauge WinTV-HVR1290 [0070:8551]		26 -> Hauppauge WinTV-HVR1290 [0070:8551]
			27 -> Mygica X8558 PRO DMB-TH [14f1:8578]

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

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -269,6 +269,11 @@ struct cx23885_board cx23885_boards[] = {
	.name = "Hauppauge WinTV-HVR1290",		.name = "Hauppauge WinTV-HVR1290",
	.portc = CX23885_MPEG_DVB,		.portc = CX23885_MPEG_DVB,
	},		},
			[CX23885_BOARD_MYGICA_X8558PRO] = {
			.name = "Mygica X8558 PRO DMB-TH",
			.portb = CX23885_MPEG_DVB,
			.portc = CX23885_MPEG_DVB,
			},
	};		};
	const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);		const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);

	@@ -408,6 +413,10 @@ struct cx23885_subid cx23885_subids[] = {
	.subvendor = 0x0070,		.subvendor = 0x0070,
	.subdevice = 0x8551,		.subdevice = 0x8551,
	.card = CX23885_BOARD_HAUPPAUGE_HVR1290,		.card = CX23885_BOARD_HAUPPAUGE_HVR1290,
			}, {
			.subvendor = 0x14f1,
			.subdevice = 0x8578,
			.card = CX23885_BOARD_MYGICA_X8558PRO,
	},		},
	};		};
	const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);		const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
	@@ -830,6 +839,15 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
	cx23885_gpio_set(dev, GPIO_0 \| GPIO_1 \| GPIO_2);		cx23885_gpio_set(dev, GPIO_0 \| GPIO_1 \| GPIO_2);
	mdelay(100);		mdelay(100);
	break;		break;
			case CX23885_BOARD_MYGICA_X8558PRO:
			/* GPIO-0 reset first ATBM8830 */
			/* GPIO-1 reset second ATBM8830 */
			cx23885_gpio_enable(dev, GPIO_0 \| GPIO_1, 1);
			cx23885_gpio_clear(dev, GPIO_0 \| GPIO_1);
			mdelay(100);
			cx23885_gpio_set(dev, GPIO_0 \| GPIO_1);
			mdelay(100);
			break;
	case CX23885_BOARD_HAUPPAUGE_HVR1850:		case CX23885_BOARD_HAUPPAUGE_HVR1850:
	case CX23885_BOARD_HAUPPAUGE_HVR1290:		case CX23885_BOARD_HAUPPAUGE_HVR1290:
	/* GPIO-0 656_CLK */		/* GPIO-0 656_CLK */
	@@ -1005,6 +1023,14 @@ void cx23885_card_setup(struct cx23885_dev *dev)
	ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */		ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
	ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;		ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
	break;		break;
			case CX23885_BOARD_MYGICA_X8558PRO:
			ts1->gen_ctrl_val = 0x5; /* Parallel */
			ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
			ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
			ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
			ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
			ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
			break;
	case CX23885_BOARD_HAUPPAUGE_HVR1250:		case CX23885_BOARD_HAUPPAUGE_HVR1250:
	case CX23885_BOARD_HAUPPAUGE_HVR1500:		case CX23885_BOARD_HAUPPAUGE_HVR1500:
	case CX23885_BOARD_HAUPPAUGE_HVR1500Q:		case CX23885_BOARD_HAUPPAUGE_HVR1500Q:

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

+64 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@
	#include "tda18271.h"		#include "tda18271.h"
	#include "lgdt330x.h"		#include "lgdt330x.h"
	#include "xc5000.h"		#include "xc5000.h"
			#include "max2165.h"
	#include "tda10048.h"		#include "tda10048.h"
	#include "tuner-xc2028.h"		#include "tuner-xc2028.h"
	#include "tuner-simple.h"		#include "tuner-simple.h"
	@@ -54,6 +55,7 @@
	#include "netup-eeprom.h"		#include "netup-eeprom.h"
	#include "netup-init.h"		#include "netup-init.h"
	#include "lgdt3305.h"		#include "lgdt3305.h"
			#include "atbm8830.h"

	static unsigned int debug;		static unsigned int debug;

	@@ -543,6 +545,38 @@ static struct xc5000_config magicpro_prohdtve2_xc5000_config = {
	.if_khz = 6500,		.if_khz = 6500,
	};		};

			static struct atbm8830_config mygica_x8558pro_atbm8830_cfg1 = {
			.prod = ATBM8830_PROD_8830,
			.demod_address = 0x44,
			.serial_ts = 0,
			.ts_sampling_edge = 1,
			.ts_clk_gated = 0,
			.osc_clk_freq = 30400, /* in kHz */
			.if_freq = 0, /* zero IF */
			.zif_swap_iq = 1,
			};

			static struct max2165_config mygic_x8558pro_max2165_cfg1 = {
			.i2c_address = 0x60,
			.osc_clk = 20
			};

			static struct atbm8830_config mygica_x8558pro_atbm8830_cfg2 = {
			.prod = ATBM8830_PROD_8830,
			.demod_address = 0x44,
			.serial_ts = 1,
			.ts_sampling_edge = 1,
			.ts_clk_gated = 0,
			.osc_clk_freq = 30400, /* in kHz */
			.if_freq = 0, /* zero IF */
			.zif_swap_iq = 1,
			};

			static struct max2165_config mygic_x8558pro_max2165_cfg2 = {
			.i2c_address = 0x60,
			.osc_clk = 20
			};

	static int dvb_register(struct cx23885_tsport *port)		static int dvb_register(struct cx23885_tsport *port)
	{		{
	struct cx23885_dev *dev = port->dev;		struct cx23885_dev *dev = port->dev;
	@@ -908,6 +942,36 @@ static int dvb_register(struct cx23885_tsport *port)
	0x60, &dev->i2c_bus[0].i2c_adap,		0x60, &dev->i2c_bus[0].i2c_adap,
	&hauppauge_tda18271_config);		&hauppauge_tda18271_config);
	break;		break;
			case CX23885_BOARD_MYGICA_X8558PRO:
			switch (port->nr) {
			/* port B */
			case 1:
			i2c_bus = &dev->i2c_bus[0];
			fe0->dvb.frontend = dvb_attach(atbm8830_attach,
			&mygica_x8558pro_atbm8830_cfg1,
			&i2c_bus->i2c_adap);
			if (fe0->dvb.frontend != NULL) {
			dvb_attach(max2165_attach,
			fe0->dvb.frontend,
			&i2c_bus->i2c_adap,
			&mygic_x8558pro_max2165_cfg1);
			}
			break;
			/* port C */
			case 2:
			i2c_bus = &dev->i2c_bus[1];
			fe0->dvb.frontend = dvb_attach(atbm8830_attach,
			&mygica_x8558pro_atbm8830_cfg2,
			&i2c_bus->i2c_adap);
			if (fe0->dvb.frontend != NULL) {
			dvb_attach(max2165_attach,
			fe0->dvb.frontend,
			&i2c_bus->i2c_adap,
			&mygic_x8558pro_max2165_cfg2);
			}
			break;
			}
			break;

	default:		default:
	printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "		printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "

drivers/media/video/cx23885/cx23885.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -80,6 +80,7 @@
	#define CX23885_BOARD_HAUPPAUGE_HVR1850 24		#define CX23885_BOARD_HAUPPAUGE_HVR1850 24
	#define CX23885_BOARD_COMPRO_VIDEOMATE_E800 25		#define CX23885_BOARD_COMPRO_VIDEOMATE_E800 25
	#define CX23885_BOARD_HAUPPAUGE_HVR1290 26		#define CX23885_BOARD_HAUPPAUGE_HVR1290 26
			#define CX23885_BOARD_MYGICA_X8558PRO 27

	#define GPIO_0 0x00000001		#define GPIO_0 0x00000001
	#define GPIO_1 0x00000002		#define GPIO_1 0x00000002