From: Steven Toth <stoth@hauppauge.com>
Date: Tue, 22 Jan 2008 04:03:10 +0000 (-0300)
Subject: V4L/DVB (7059): cx88: Ensure the tuner is reset correctly
X-Git-Tag: v2.6.25-rc1~1235^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e04f720f23cfa8d4400d832784f3a424379227;p=linux-2.6

V4L/DVB (7059): cx88: Ensure the tuner is reset correctly

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>
---

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 254290975c..e6b7f518c5 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -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 {