From 95a1eb921b0a4095bc6dfe80c4ad26779d3f546d Mon Sep 17 00:00:00 2001
From: Edgar Pisani <episani@onqweb.com.au>
Date: Mon, 25 Jun 2007 14:46:05 -0300
Subject: [PATCH] --- yaml --- r: 61342 b: refs/heads/master c:
 e7d11ecbde987e56845cff012b4a28d7001667b8 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx88/cx88-input.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2e5d360a7a5e..efb9f2154bf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39cf1e810a6b464a8469bf318f21206d84ffb1d8
+refs/heads/master: e7d11ecbde987e56845cff012b4a28d7001667b8
diff --git a/trunk/drivers/media/video/cx88/cx88-input.c b/trunk/drivers/media/video/cx88/cx88-input.c
index 5915dbabd608..22cbdf2f0fdd 100644
--- a/trunk/drivers/media/video/cx88/cx88-input.c
+++ b/trunk/drivers/media/video/cx88/cx88-input.c
@@ -90,6 +90,9 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 		auxgpio = cx_read(MO_GP1_IO);
 		/* Take out the parity part */
 		gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
+	} else if (core->board == CX88_BOARD_WINFAST_DTV1000) {
+		gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900);
+		auxgpio = gpio;
 	} else
 		auxgpio = gpio;
 
@@ -231,6 +234,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 		ir->polling = 50; /* ms */
 		break;
 	case CX88_BOARD_WINFAST2000XP_EXPERT:
+	case CX88_BOARD_WINFAST_DTV1000:
 		ir_codes = ir_codes_winfast;
 		ir->gpio_addr = MO_GP0_IO;
 		ir->mask_keycode = 0x8f8;