]> err.no Git - linux-2.6/commitdiff
V4L/DVB (7059): cx88: Ensure the tuner is reset correctly
authorSteven Toth <stoth@hauppauge.com>
Tue, 22 Jan 2008 04:03:10 +0000 (01:03 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 25 Jan 2008 21:05:12 +0000 (19:05 -0200)
Previous patches assume the tuner was on a different gpio. This patch
corrects this.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Chaogui Zhang <czhang1974@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/cx88/cx88-cards.c

index 254290975cdb62f4327c43a31e5829858b32b3c2..e6b7f518c56e8f552ade9e463b4fb2093e8f6519 100644 (file)
@@ -1893,12 +1893,10 @@ int cx88_tuner_callback(void *priv, int command, int arg)
        switch(core->boardnr) {
        case CX88_BOARD_PINNACLE_PCTV_HD_800i:
                if(command == 0) { /* This is the reset command from xc5000 */
-                       /* Reset XC5000 tuner via GPIO pin #2 */
-                       cx_set(MO_GP0_IO, 0x00000400);
-                       cx_clear(MO_GP0_IO, 0x00000004);
-                       mdelay(200);
-                       cx_set(MO_GP0_IO, 0x00000004);
-                       mdelay(200);
+                       /* Reset XC5000 tuner via SYS_RSTO_pin */
+                       cx_write(MO_SRST_IO, 0);
+                       msleep(10);
+                       cx_write(MO_SRST_IO, 1);
                        return 0;
                }
                else {