aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index ce29b5e34a11..a9d362981473 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -201,6 +201,10 @@ struct cx23885_board cx23885_boards[] = {
201 .name = "Mygica X8506 DMB-TH", 201 .name = "Mygica X8506 DMB-TH",
202 .portb = CX23885_MPEG_DVB, 202 .portb = CX23885_MPEG_DVB,
203 }, 203 },
204 [CX23885_BOARD_MAGICPRO_PROHDTVE2] = {
205 .name = "Magic-Pro ProHDTV Extreme 2",
206 .portb = CX23885_MPEG_DVB,
207 },
204}; 208};
205const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); 209const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
206 210
@@ -324,6 +328,10 @@ struct cx23885_subid cx23885_subids[] = {
324 .subvendor = 0x14f1, 328 .subvendor = 0x14f1,
325 .subdevice = 0x8651, 329 .subdevice = 0x8651,
326 .card = CX23885_BOARD_MYGICA_X8506, 330 .card = CX23885_BOARD_MYGICA_X8506,
331 }, {
332 .subvendor = 0x14f1,
333 .subdevice = 0x8657,
334 .card = CX23885_BOARD_MAGICPRO_PROHDTVE2,
327 }, 335 },
328}; 336};
329const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); 337const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -715,8 +723,9 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
715 cx23885_gpio_set(dev, GPIO_9); 723 cx23885_gpio_set(dev, GPIO_9);
716 break; 724 break;
717 case CX23885_BOARD_MYGICA_X8506: 725 case CX23885_BOARD_MYGICA_X8506:
726 case CX23885_BOARD_MAGICPRO_PROHDTVE2:
718 /* GPIO-1 reset XC5000 */ 727 /* GPIO-1 reset XC5000 */
719 /* GPIO-2 reset LGS8GL5 */ 728 /* GPIO-2 reset LGS8GL5 / LGS8G75 */
720 cx_set(GP0_IO, 0x00060000); 729 cx_set(GP0_IO, 0x00060000);
721 cx_clear(GP0_IO, 0x00000006); 730 cx_clear(GP0_IO, 0x00000006);
722 mdelay(100); 731 mdelay(100);
@@ -827,6 +836,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
827 ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; 836 ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
828 break; 837 break;
829 case CX23885_BOARD_MYGICA_X8506: 838 case CX23885_BOARD_MYGICA_X8506:
839 case CX23885_BOARD_MAGICPRO_PROHDTVE2:
830 ts1->gen_ctrl_val = 0x5; /* Parallel */ 840 ts1->gen_ctrl_val = 0x5; /* Parallel */
831 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ 841 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
832 ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; 842 ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;