1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 23302ddf4187..1ec48169277d 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -782,10 +782,14 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x00040004);
                 break;
         case CX23885_BOARD_TBS_6920:
-        case CX23885_BOARD_TEVII_S470:
                 cx_write(MC417_CTL, 0x00000036);
                 cx_write(MC417_OEN, 0x00001000);
-                cx_write(MC417_RWD, 0x00001800);
+                cx_set(MC417_RWD, 0x00000002);
+                mdelay(200);
+                cx_clear(MC417_RWD, 0x00000800);
+                mdelay(200);
+                cx_set(MC417_RWD, 0x00000800);
+                mdelay(200);
                 break;
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
                 /* GPIO-0 INTA from CiMax1
@@ -1002,8 +1006,12 @@ 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_TEVII_S470:
         case CX23885_BOARD_TBS_6920:
+                ts1->gen_ctrl_val  = 0x4; /* Parallel */
+                ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                break;
+        case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_DVBWORLD_2005:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */