SRU LP302509 - sms1xxx: identify Dell Digital TV Receiver devices correctly

[Tim Gardner]

>From fb9c7b28773d23ff5eed015b85bdb3582a4bd5aa Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue, 25 Nov 2008 21:03:09 -0500
Subject: [PATCH] UBUNTU: sms1xxx: identify "Dell Digital TV Receiver" devices correctly

OriginalAuthor: Michael Krufky <mkrufky at linuxtv.org>
OriginalLocation: http://launchpadlibrarian.net/19968366/0001-UBUNTU-sms1xxx-identify-Dell-Digital-TV-Receiver.patch
Bug: #302509

sms1xxx: identify "Dell Digital TV Receiver" devices correctly

Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 drivers/media/dvb/siano/sms-cards.c |   31 ++++++++++++++++++++++---------
 drivers/media/dvb/siano/sms-cards.h |    4 +++-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index fd62e0b..395ace8 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -41,13 +41,13 @@ struct usb_device_id smsusb_id_table[] = {
 	{ USB_DEVICE(0x2040, 0x2000),
 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
 	{ USB_DEVICE(0x2040, 0x2009),
-		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },
+		.driver_info = SMS1XXX_BOARD_DELL_TIGER_MINICARD_R2 },
 	{ USB_DEVICE(0x2040, 0x200a),
-		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
+		.driver_info = SMS1XXX_BOARD_DELL_TIGER_MINICARD },
 	{ USB_DEVICE(0x2040, 0x2010),
 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
 	{ USB_DEVICE(0x2040, 0x2019),
-		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
+		.driver_info = SMS1XXX_BOARD_DELL_TIGER_MINICARD },
 	{ USB_DEVICE(0x2040, 0x5500),
 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
 	{ USB_DEVICE(0x2040, 0x5510),
@@ -57,9 +57,9 @@ struct usb_device_id smsusb_id_table[] = {
 	{ USB_DEVICE(0x2040, 0x5530),
 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
 	{ USB_DEVICE(0x2040, 0x5580),
-		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+		.driver_info = SMS1XXX_BOARD_DELL_DVBT },
 	{ USB_DEVICE(0x2040, 0x5590),
-		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+		.driver_info = SMS1XXX_BOARD_DELL_DVBT },
 	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, smsusb_id_table);
@@ -110,14 +110,25 @@ static struct sms_board sms_boards[] = {
 		.led_lo    = 27,
 		.led_hi    = 28,
 	},
+	[SMS1XXX_BOARD_DELL_DVBT] = {
+		.name	= "Dell Digital TV Receiver",
+		.type	= SMS_NOVA_B0,
+		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
+	},
 	[SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD] = {
 		.name	= "Hauppauge WinTV MiniCard",
 		.type	= SMS_NOVA_B0,
 		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
 		.lna_ctrl  = 29,
 	},
-	[SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2] = {
-		.name	= "Hauppauge WinTV MiniCard",
+	[SMS1XXX_BOARD_DELL_TIGER_MINICARD] = {
+		.name	= "Dell Digital TV Receiver",
+		.type	= SMS_NOVA_B0,
+		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
+		.lna_ctrl  = 29,
+	},
+	[SMS1XXX_BOARD_DELL_TIGER_MINICARD_R2] = {
+		.name	= "Dell Digital TV Receiver",
 		.type	= SMS_NOVA_B0,
 		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
 		.lna_ctrl  = 1,
@@ -165,7 +176,8 @@ int sms_board_setup(struct smscore_device_t *coredev)
 		sms_set_gpio(coredev, board->led_hi, 0);
 		sms_set_gpio(coredev, board->led_lo, 0);
 		break;
-	case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:
+	case SMS1XXX_BOARD_DELL_TIGER_MINICARD_R2:
+	case SMS1XXX_BOARD_DELL_TIGER_MINICARD:
 	case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:
 		/* turn off LNA */
 		sms_set_gpio(coredev, board->lna_ctrl, 0);
@@ -185,7 +197,8 @@ int sms_board_power(struct smscore_device_t *coredev, int onoff)
 		sms_set_gpio(coredev,
 			     board->led_power, onoff ? 1 : 0);
 		break;
-	case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:
+	case SMS1XXX_BOARD_DELL_TIGER_MINICARD_R2:
+	case SMS1XXX_BOARD_DELL_TIGER_MINICARD:
 	case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:
 		/* LNA */
 		sms_set_gpio(coredev,
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h
index 8e0fe9f..99bb1d4 100644
--- a/drivers/media/dvb/siano/sms-cards.h
+++ b/drivers/media/dvb/siano/sms-cards.h
@@ -33,7 +33,9 @@
 #define SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B 7
 #define SMS1XXX_BOARD_HAUPPAUGE_WINDHAM 8
 #define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD 9
-#define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 10
+#define SMS1XXX_BOARD_DELL_TIGER_MINICARD_R2 10
+#define SMS1XXX_BOARD_DELL_TIGER_MINICARD 11
+#define SMS1XXX_BOARD_DELL_DVBT 12
 
 struct sms_board {
 	enum sms_device_type_st type;
-- 
1.5.6.3