summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-01 05:02:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-01 05:02:59 -0300
commitdd4931dd692b5001b3ccb4d7d74c1d4481f3a7be (patch)
tree159af14f7ff781703660d7f12a142b90ef64e52c /linux/drivers/media/video/cx23885/cx23885-cards.c
parent3d5f82276e18a37806603a52b23d18c8b60b5d01 (diff)
parentd7709cc1d93ee6c75fc6e421ae5e8646aff438a7 (diff)
downloadmediapointer-dvb-s2-dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be.tar.gz
mediapointer-dvb-s2-dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-av-core
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-cards.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-cards.c b/linux/drivers/media/video/cx23885/cx23885-cards.c
index 93176fe4b..35b2abd6a 100644
--- a/linux/drivers/media/video/cx23885/cx23885-cards.c
+++ b/linux/drivers/media/video/cx23885/cx23885-cards.c
@@ -198,6 +198,10 @@ struct cx23885_board cx23885_boards[] = {
.name = "Hauppauge WinTV-HVR1210",
.portc = CX23885_MPEG_DVB,
},
+ [CX23885_BOARD_MYGICA_X8506] = {
+ .name = "Mygica X8506 DMB-TH",
+ .portb = CX23885_MPEG_DVB,
+ },
};
const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
@@ -317,6 +321,10 @@ struct cx23885_subid cx23885_subids[] = {
.subvendor = 0x0070,
.subdevice = 0x2295,
.card = CX23885_BOARD_HAUPPAUGE_HVR1210,
+ }, {
+ .subvendor = 0x14f1,
+ .subdevice = 0x8651,
+ .card = CX23885_BOARD_MYGICA_X8506,
},
};
const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -707,6 +715,15 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
mdelay(20);
cx23885_gpio_set(dev, GPIO_9);
break;
+ case CX23885_BOARD_MYGICA_X8506:
+ /* GPIO-1 reset XC5000 */
+ /* GPIO-2 reset LGS8GL5 */
+ cx_set(GP0_IO, 0x00060000);
+ cx_clear(GP0_IO, 0x00000006);
+ mdelay(100);
+ cx_set(GP0_IO, 0x00060006);
+ mdelay(100);
+ break;
}
}
@@ -810,6 +827,11 @@ void cx23885_card_setup(struct cx23885_dev *dev)
ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
break;
+ case CX23885_BOARD_MYGICA_X8506:
+ 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;
+ break;
case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_HAUPPAUGE_HVR1500:
case CX23885_BOARD_HAUPPAUGE_HVR1500Q: