[linux-dvb] [PATCH, RFC] KWorld ATSC-115 detection

[Eric Sandeen]

So, just got my shiny new Kworld ATSC-115 card in the mail.

Any desire for a patch to actually detect the new PCI ID, even
though I guess it's pretty much the same card as the ATSC 110?

Full-on pedantic patch below, I know not all of this needs to be
duplicated if it's truly identical hardware....

Comments?  (build & load tested only, not currently near a signal
to test it but I assume it's fine, since using the card=90 module
option is reported to work)

Thanks,

-Eric

Signed-off-by: Eric Sandeen <sandeen at sandeen.net>

Index: v4l-dvb/linux/Documentation/video4linux/CARDLIST.saa7134
===================================================================
--- v4l-dvb.orig/linux/Documentation/video4linux/CARDLIST.saa7134
+++ v4l-dvb/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -116,3 +116,4 @@
 115 -> Sabrent PCMCIA TV-PCB05                  [0919:2003]
 116 -> 10MOONS TM300 TV Card                    [1131:2304]
 117 -> Avermedia Super 007                      [1461:f01d]
+118 -> Kworld ATSC115                           [17de:7352]
Index: v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
===================================================================
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -2845,6 +2845,30 @@ struct saa7134_board saa7134_boards[] = 
 			.amux = LINE2,
 		}},
 	},
+	[SAA7134_BOARD_KWORLD_ATSC115] = {
+		.name           = "Kworld ATSC115",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TUV1236D,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs         = {{
+			.name = name_tv,
+			.vmux = 1,
+			.amux = TV,
+			.tv   = 1,
+		},{
+			.name = name_comp1,
+			.vmux = 3,
+			.amux = LINE2,
+		},{
+			.name = name_svideo,
+			.vmux = 8,
+			.amux = LINE2,
+		}},
+	},
 	[SAA7134_BOARD_AVERMEDIA_A169_B] = {
 		/* AVerMedia A169  */
 		/* Rickard Osser <ricky at osser.se>  */
@@ -4123,6 +4147,12 @@ struct pci_device_id saa7134_pci_tbl[] =
 		.driver_data  = SAA7134_BOARD_KWORLD_ATSC110,
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
+		.subvendor    = 0x17de,
+		.subdevice    = 0x7352,
+		.driver_data  = SAA7134_BOARD_KWORLD_ATSC115,
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
 		.subvendor    = 0x1461,
 		.subdevice    = 0x7360,
@@ -4727,6 +4757,7 @@ int saa7134_board_init2(struct saa7134_d
 		}
 		break;
 	case SAA7134_BOARD_KWORLD_ATSC110:
+	case SAA7134_BOARD_KWORLD_ATSC115:
 		{
 			/* enable tuner */
 			int i;
Index: v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c
===================================================================
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -839,6 +839,10 @@ static struct nxt200x_config kworldatsc1
 	.demod_address    = 0x0a,
 };
 
+static struct nxt200x_config kworldatsc115 = {
+	.demod_address    = 0x0a,
+};
+
 /* ==================================================================
  * Core code
  */
@@ -991,6 +995,14 @@ static int dvb_init(struct saa7134_dev *
 				   NULL, DVB_PLL_TUV1236D);
 		}
 		break;
+	case SAA7134_BOARD_KWORLD_ATSC115:
+		dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc115,
+					       &dev->i2c_adap);
+		if (dev->dvb.frontend) {
+			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+				   NULL, DVB_PLL_TUV1236D);
+		}
+		break;
 	case SAA7134_BOARD_FLYDVBS_LR300:
 		dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
 					       &dev->i2c_adap);
Index: v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h
===================================================================
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134.h
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h
@@ -247,6 +247,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_SABRENT_TV_PCB05     115
 #define SAA7134_BOARD_10MOONSTVMASTER3     116
 #define SAA7134_BOARD_AVERMEDIA_SUPER_007  117
+#define SAA7134_BOARD_KWORLD_ATSC115       118
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8