jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: re-add (horrible adapted) linux-210-dvbsky.patch

Browse Source
This commit is contained in:
Stefan Saraev 2013-05-02 19:27:26 +03:00
parent a1c7444c7b
commit a7c8a61722
1 changed files with 547 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

585
packages/linux/patches/3.9/linux-210-dvbsky.patch.todo → packages/linux/patches/3.9/linux-210-dvbsky.patch vendored
View File

@ -1,7 +1,14 @@
diff -urN a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig commit 4bdd1ddad006dd3679997eb50fc89e5d25f01bcf
--- a/drivers/media/dvb-frontends/Kconfig 2013-03-21 04:11:19.000000000 +0800 Author: Stefan Saraev <stefan@saraev.ca>
+++ b/drivers/media/dvb-frontends/Kconfig 2013-04-23 22:14:23.000000000 +0800 Date: Thu May 2 19:22:03 2013 +0300
@@ -200,6 +200,20 @@
dvbsky
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 48e0195..c959836 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -225,6 +225,20 @@ config DVB_CX24116
help help
A DVB-S/S2 tuner module. Say Y when you want to support this frontend. A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
@ -22,9 +29,22 @@ diff -urN a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kc
config DVB_SI21XX config DVB_SI21XX
tristate "Silicon Labs SI21XX based" tristate "Silicon Labs SI21XX based"
depends on DVB_CORE && I2C depends on DVB_CORE && I2C
diff -urN a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontends/m88dc2800.c diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
--- a/drivers/media/dvb-frontends/m88dc2800.c 1970-01-01 08:00:00.000000000 +0800 index 46222e0..74afb5c 100644
+++ b/drivers/media/dvb-frontends/m88dc2800.c 2013-01-26 16:03:21.000000000 +0800 --- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -109,4 +109,5 @@ obj-$(CONFIG_DVB_RTL2830) += rtl2830.o
obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
obj-$(CONFIG_DVB_AF9033) += af9033.o
-
+obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o
+obj-$(CONFIG_DVB_M88DC2800) += m88dc2800.o
diff --git a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontends/m88dc2800.c
new file mode 100644
index 0000000..f876a11
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88dc2800.c
@@ -0,0 +1,2124 @@ @@ -0,0 +1,2124 @@
+/* +/*
+ M88DC2800/M88TC2800 - DVB-C demodulator and tuner from Montage + M88DC2800/M88TC2800 - DVB-C demodulator and tuner from Montage
@ -2150,9 +2170,11 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontend
+MODULE_AUTHOR("Max Nibble <nibble.max@gmail.com>"); +MODULE_AUTHOR("Max Nibble <nibble.max@gmail.com>");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_VERSION("1.00"); +MODULE_VERSION("1.00");
diff -urN a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontends/m88dc2800.h diff --git a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontends/m88dc2800.h
--- a/drivers/media/dvb-frontends/m88dc2800.h 1970-01-01 08:00:00.000000000 +0800 new file mode 100644
+++ b/drivers/media/dvb-frontends/m88dc2800.h 2013-01-26 14:57:32.000000000 +0800 index 0000000..577b19d
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88dc2800.h
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+/* +/*
+ M88DC2800/M88TC2800 - DVB-C demodulator and tuner from Montage + M88DC2800/M88TC2800 - DVB-C demodulator and tuner from Montage
@ -2197,9 +2219,11 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontend
+} +}
+#endif /* CONFIG_DVB_M88DC2800 */ +#endif /* CONFIG_DVB_M88DC2800 */
+#endif /* M88DC2800_H */ +#endif /* M88DC2800_H */
diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
--- a/drivers/media/dvb-frontends/m88ds3103.c 1970-01-01 08:00:00.000000000 +0800 new file mode 100644
+++ b/drivers/media/dvb-frontends/m88ds3103.c 2013-01-30 12:33:47.000000000 +0800 index 0000000..315809d
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -0,0 +1,1710 @@ @@ -0,0 +1,1710 @@
+/* +/*
+ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver + Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@ -3911,9 +3935,11 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontend
+MODULE_DESCRIPTION("DVB Frontend module for Montage DS3103/TS2022 hardware"); +MODULE_DESCRIPTION("DVB Frontend module for Montage DS3103/TS2022 hardware");
+MODULE_AUTHOR("Max nibble"); +MODULE_AUTHOR("Max nibble");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -urN a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontends/m88ds3103.h diff --git a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontends/m88ds3103.h
--- a/drivers/media/dvb-frontends/m88ds3103.h 1970-01-01 08:00:00.000000000 +0800 new file mode 100644
+++ b/drivers/media/dvb-frontends/m88ds3103.h 2013-01-30 12:33:51.000000000 +0800 index 0000000..c7b690e
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88ds3103.h
@@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
+/* +/*
+ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver + Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@ -3968,9 +3994,11 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontend
+} +}
+#endif /* CONFIG_DVB_M88DS3103 */ +#endif /* CONFIG_DVB_M88DS3103 */
+#endif /* M88DS3103_H */ +#endif /* M88DS3103_H */
diff -urN a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h diff --git a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h
--- a/drivers/media/dvb-frontends/m88ds3103_priv.h 1970-01-01 08:00:00.000000000 +0800 new file mode 100644
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h 2013-01-30 12:33:56.000000000 +0800 index 0000000..2838514
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h
@@ -0,0 +1,403 @@ @@ -0,0 +1,403 @@
+/* +/*
+ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver + Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@ -4375,20 +4403,24 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-fro
+}; +};
+ +
+#endif /* M88DS3103_PRIV_H */ +#endif /* M88DS3103_PRIV_H */
diff -urN a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
--- a/drivers/media/dvb-frontends/Makefile 2013-03-21 04:11:19.000000000 +0800 index b3688aa..e18e0fc 100644
+++ b/drivers/media/dvb-frontends/Makefile 2013-04-23 22:15:04.000000000 +0800 --- a/drivers/media/pci/cx23885/Kconfig
@@ -102,4 +102,5 @@ +++ b/drivers/media/pci/cx23885/Kconfig
obj-$(CONFIG_DVB_RTL2832) += rtl2832.o @@ -23,6 +23,8 @@ config VIDEO_CX23885
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
obj-$(CONFIG_DVB_AF9033) += af9033.o select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
- select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o + select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+obj-$(CONFIG_DVB_M88DC2800) += m88dc2800.o + select DVB_M88DC2800 if MEDIA_SUBDRV_AUTOSELECT
diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/cx23885/cimax2.c 2013-03-21 04:11:19.000000000 +0800 select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
+++ b/drivers/media/pci/cx23885/cimax2.c 2013-03-31 22:03:29.000000000 +0800 select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
@@ -415,7 +415,7 @@ diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
index 7344849..369ae7c 100644
--- a/drivers/media/pci/cx23885/cimax2.c
+++ b/drivers/media/pci/cx23885/cimax2.c
@@ -415,7 +415,7 @@ int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221,
return state->status; return state->status;
} }
@ -4397,7 +4429,7 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax
{ {
struct netup_ci_state *state; struct netup_ci_state *state;
u8 cimax_init[34] = { u8 cimax_init[34] = {
@@ -464,6 +464,11 @@ @@ -464,6 +464,11 @@ int netup_ci_init(struct cx23885_tsport *port)
goto err; goto err;
} }
@ -4409,7 +4441,7 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax
port->port_priv = state; port->port_priv = state;
switch (port->nr) { switch (port->nr) {
@@ -537,3 +542,19 @@ @@ -537,3 +542,19 @@ void netup_ci_exit(struct cx23885_tsport *port)
dvb_ca_en50221_release(&state->ca); dvb_ca_en50221_release(&state->ca);
kfree(state); kfree(state);
} }
@ -4429,10 +4461,11 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax
+ +
+ return 1; + return 1;
+} +}
diff -urN a/drivers/media/pci/cx23885/cimax2.h b/drivers/media/pci/cx23885/cimax2.h diff --git a/drivers/media/pci/cx23885/cimax2.h b/drivers/media/pci/cx23885/cimax2.h
--- a/drivers/media/pci/cx23885/cimax2.h 2013-03-21 04:11:19.000000000 +0800 index 518744a..39f3db7 100644
+++ b/drivers/media/pci/cx23885/cimax2.h 2013-01-30 12:34:37.000000000 +0800 --- a/drivers/media/pci/cx23885/cimax2.h
@@ -41,7 +41,9 @@ +++ b/drivers/media/pci/cx23885/cimax2.h
@@ -41,7 +41,9 @@ extern int netup_ci_slot_ts_ctl(struct dvb_ca_en50221 *en50221, int slot);
extern int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status); extern int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status);
extern int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, extern int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221,
int slot, int open); int slot, int open);
@ -4443,10 +4476,11 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.h b/drivers/media/pci/cx23885/cimax
+extern int dvbsky_ci_slot_status(struct cx23885_dev *dev); +extern int dvbsky_ci_slot_status(struct cx23885_dev *dev);
+ +
#endif #endif
diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
--- a/drivers/media/pci/cx23885/cx23885-cards.c 2013-03-21 04:11:19.000000000 +0800 index 7e923f8..ed27f3d 100644
+++ b/drivers/media/pci/cx23885/cx23885-cards.c 2013-04-23 22:19:57.000000000 +0800 --- a/drivers/media/pci/cx23885/cx23885-cards.c
@@ -569,9 +569,37 @@ +++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -569,9 +569,37 @@ struct cx23885_board cx23885_boards[] = {
.name = "TeVii S471", .name = "TeVii S471",
.portb = CX23885_MPEG_DVB, .portb = CX23885_MPEG_DVB,
}, },
@ -4483,10 +4517,10 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
+ [CX23885_BOARD_PROF_8000] = { + [CX23885_BOARD_PROF_8000] = {
+ .name = "Prof Revolution DVB-S2 8000", + .name = "Prof Revolution DVB-S2 8000",
+ .portb = CX23885_MPEG_DVB, + .portb = CX23885_MPEG_DVB,
} },
}; [CX23885_BOARD_HAUPPAUGE_HVR4400] = {
const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); .name = "Hauppauge WinTV-HVR4400",
@@ -785,9 +813,33 @@ @@ -818,9 +846,33 @@ struct cx23885_subid cx23885_subids[] = {
.subdevice = 0x9022, .subdevice = 0x9022,
.card = CX23885_BOARD_TEVII_S471, .card = CX23885_BOARD_TEVII_S471,
}, { }, {
@ -4520,10 +4554,10 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
+ .subvendor = 0x8000, + .subvendor = 0x8000,
+ .subdevice = 0x3034, + .subdevice = 0x3034,
+ .card = CX23885_BOARD_PROF_8000, + .card = CX23885_BOARD_PROF_8000,
}, }, {
}; .subvendor = 0x0070,
const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); .subdevice = 0xc108,
@@ -1167,7 +1219,7 @@ @@ -1224,7 +1276,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
cx_set(GP0_IO, 0x00040004); cx_set(GP0_IO, 0x00040004);
break; break;
case CX23885_BOARD_TBS_6920: case CX23885_BOARD_TBS_6920:
@ -4532,9 +4566,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
cx_write(MC417_CTL, 0x00000036); cx_write(MC417_CTL, 0x00000036);
cx_write(MC417_OEN, 0x00001000); cx_write(MC417_OEN, 0x00001000);
cx_set(MC417_RWD, 0x00000002); cx_set(MC417_RWD, 0x00000002);
@@ -1301,9 +1353,84 @@ @@ -1394,9 +1446,84 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
/* enable irq */ cx_set(GP0_IO, 0x00040004);
cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/ mdelay(60);
break; break;
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
@ -4617,7 +4651,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
int cx23885_ir_init(struct cx23885_dev *dev) int cx23885_ir_init(struct cx23885_dev *dev)
{ {
static struct v4l2_subdev_io_pin_config ir_rxtx_pin_cfg[] = { static struct v4l2_subdev_io_pin_config ir_rxtx_pin_cfg[] = {
@@ -1388,6 +1515,23 @@ @@ -1482,6 +1609,23 @@ int cx23885_ir_init(struct cx23885_dev *dev)
v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config, v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
ir_rx_pin_cfg_count, ir_rx_pin_cfg); ir_rx_pin_cfg_count, ir_rx_pin_cfg);
break; break;
@ -4641,10 +4675,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
if (!enable_885_ir) if (!enable_885_ir)
break; break;
@@ -1420,6 +1564,12 @@ @@ -1515,6 +1659,13 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_MYGICA_X8507:
+// seo
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ case CX23885_BOARD_DVBSKY_S952: + case CX23885_BOARD_DVBSKY_S952:
@ -4654,10 +4689,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
cx23885_irq_remove(dev, PCI_MSK_AV_CORE); cx23885_irq_remove(dev, PCI_MSK_AV_CORE);
/* sd_ir is a duplicate pointer to the AV Core, just clear it */ /* sd_ir is a duplicate pointer to the AV Core, just clear it */
dev->sd_ir = NULL; dev->sd_ir = NULL;
@@ -1464,6 +1614,12 @@ @@ -1560,6 +1711,13 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_MYGICA_X8507:
+// seo
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ case CX23885_BOARD_DVBSKY_S952: + case CX23885_BOARD_DVBSKY_S952:
@ -4667,7 +4703,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
if (dev->sd_ir) if (dev->sd_ir)
cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE); cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
break; break;
@@ -1549,6 +1705,10 @@ @@ -1657,6 +1815,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
break; break;
@ -4678,9 +4714,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_TEVII_S471: case CX23885_BOARD_TEVII_S471:
case CX23885_BOARD_DVBWORLD_2005: case CX23885_BOARD_DVBWORLD_2005:
@@ -1581,6 +1741,22 @@ @@ -1694,6 +1856,22 @@ void cx23885_card_setup(struct cx23885_dev *dev)
ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
break; break;
+ case CX23885_BOARD_DVBSKY_S952: + case CX23885_BOARD_DVBSKY_S952:
+ ts1->gen_ctrl_val = 0x5; /* Parallel */ + ts1->gen_ctrl_val = 0x5; /* Parallel */
@ -4701,10 +4737,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_HAUPPAUGE_HVR1500: case CX23885_BOARD_HAUPPAUGE_HVR1500:
case CX23885_BOARD_HAUPPAUGE_HVR1500Q: case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
@@ -1636,6 +1812,12 @@ @@ -1750,6 +1928,13 @@ void cx23885_card_setup(struct cx23885_dev *dev)
case CX23885_BOARD_MPX885:
case CX23885_BOARD_MYGICA_X8507: case CX23885_BOARD_MYGICA_X8507:
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_AVERMEDIA_HC81R:
+// seo
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ case CX23885_BOARD_DVBSKY_S952: + case CX23885_BOARD_DVBSKY_S952:
@ -4714,10 +4751,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
&dev->i2c_bus[2].i2c_adap, &dev->i2c_bus[2].i2c_adap,
"cx25840", 0x88 >> 1, NULL); "cx25840", 0x88 >> 1, NULL);
diff -urN a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
--- a/drivers/media/pci/cx23885/cx23885-core.c 2013-03-21 04:11:19.000000000 +0800 index 268654a..70fb504 100644
+++ b/drivers/media/pci/cx23885/cx23885-core.c 2013-04-23 22:19:04.000000000 +0800 --- a/drivers/media/pci/cx23885/cx23885-core.c
@@ -1909,6 +1909,10 @@ +++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -1909,6 +1909,10 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
(pci_status & PCI_MSK_GPIO0)) (pci_status & PCI_MSK_GPIO0))
handled += altera_ci_irq(dev); handled += altera_ci_irq(dev);
@ -4728,7 +4766,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885
if (ts1_status) { if (ts1_status) {
if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
handled += cx23885_irq_ts(ts1, ts1_status); handled += cx23885_irq_ts(ts1, ts1_status);
@@ -2144,6 +2148,8 @@ @@ -2144,6 +2148,8 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
cx23885_irq_add_enable(dev, PCI_MSK_GPIO1 | PCI_MSK_GPIO0); cx23885_irq_add_enable(dev, PCI_MSK_GPIO1 | PCI_MSK_GPIO0);
break; break;
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
@ -4737,9 +4775,10 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885
cx23885_irq_add_enable(dev, PCI_MSK_GPIO0); cx23885_irq_add_enable(dev, PCI_MSK_GPIO0);
break; break;
} }
diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
--- a/drivers/media/pci/cx23885/cx23885-dvb.c 2013-03-21 04:11:19.000000000 +0800 index 9c5ed10..0cbc3e2 100644
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c 2013-04-23 22:48:39.797116340 +0800 --- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -51,6 +51,8 @@ @@ -51,6 +51,8 @@
#include "stv6110.h" #include "stv6110.h"
#include "lnbh24.h" #include "lnbh24.h"
@ -4749,49 +4788,15 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
#include "cimax2.h" #include "cimax2.h"
#include "lgs8gxx.h" #include "lgs8gxx.h"
#include "netup-eeprom.h" #include "netup-eeprom.h"
@@ -63,8 +65,8 @@ @@ -500,40 +502,127 @@ static struct xc5000_config mygica_x8506_xc5000_config = {
#include "stv0367.h"
#include "drxk.h"
#include "mt2063.h"
-#include "stv090x.h"
-#include "stb6100.h"
+#include "stv090x.h"
+#include "stb6100.h"
#include "stb6100_cfg.h"
static unsigned int debug;
@@ -492,42 +494,130 @@
.if_khz = 5380, .if_khz = 5380,
}; };
-static struct stv090x_config prof_8000_stv090x_config = {
- .device = STV0903,
- .demod_mode = STV090x_SINGLE,
- .clk_mode = STV090x_CLK_EXT,
- .xtal = 27000000,
- .address = 0x6A,
- .ts1_mode = STV090x_TSMODE_PARALLEL_PUNCTURED,
- .repeater_level = STV090x_RPTLEVEL_64,
- .adc1_range = STV090x_ADC_2Vpp,
- .diseqc_envelope_mode = false,
-
- .tuner_get_frequency = stb6100_get_frequency,
- .tuner_set_frequency = stb6100_set_frequency,
- .tuner_set_bandwidth = stb6100_set_bandwidth,
- .tuner_get_bandwidth = stb6100_get_bandwidth,
-};
-
-static struct stb6100_config prof_8000_stb6100_config = {
- .tuner_address = 0x60,
- .refclock = 27000000,
-};
-static int p8000_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+/* bst control */ +/* bst control */
+int bst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) +int bst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
{ +{
struct cx23885_tsport *port = fe->dvb->priv; + struct cx23885_tsport *port = fe->dvb->priv;
struct cx23885_dev *dev = port->dev; + struct cx23885_dev *dev = port->dev;
+ +
+ cx23885_gpio_enable(dev, GPIO_1, 1); + cx23885_gpio_enable(dev, GPIO_1, 1);
+ cx23885_gpio_enable(dev, GPIO_0, 1); + cx23885_gpio_enable(dev, GPIO_0, 1);
@ -4812,13 +4817,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ } + }
+ return 0; + return 0;
+} +}
+
- if (voltage == SEC_VOLTAGE_18)
- cx_write(MC417_RWD, 0x00001e00);
- else if (voltage == SEC_VOLTAGE_13)
- cx_write(MC417_RWD, 0x00001a00);
- else
- cx_write(MC417_RWD, 0x00001800);
+int dvbsky_set_voltage_sec(struct dvb_frontend *fe, fe_sec_voltage_t voltage) +int dvbsky_set_voltage_sec(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{ +{
+ struct cx23885_tsport *port = fe->dvb->priv; + struct cx23885_tsport *port = fe->dvb->priv;
@ -4841,9 +4840,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ cx23885_gpio_clear(dev, GPIO_12); + cx23885_gpio_clear(dev, GPIO_12);
+ break; + break;
+ } + }
return 0; + return 0;
} +}
+
+/* bestunar single dvb-s2 */ +/* bestunar single dvb-s2 */
+static struct m88ds3103_config bst_ds3103_config = { +static struct m88ds3103_config bst_ds3103_config = {
+ .demod_address = 0x68, + .demod_address = 0x68,
@ -4880,7 +4879,21 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ .ts_mode = 3, + .ts_mode = 3,
+}; +};
+ +
+static struct stv090x_config prof_8000_stv090x_config = { static struct stv090x_config prof_8000_stv090x_config = {
- .device = STV0903,
- .demod_mode = STV090x_SINGLE,
- .clk_mode = STV090x_CLK_EXT,
- .xtal = 27000000,
- .address = 0x6A,
- .ts1_mode = STV090x_TSMODE_PARALLEL_PUNCTURED,
- .repeater_level = STV090x_RPTLEVEL_64,
- .adc1_range = STV090x_ADC_2Vpp,
- .diseqc_envelope_mode = false,
-
- .tuner_get_frequency = stb6100_get_frequency,
- .tuner_set_frequency = stb6100_set_frequency,
- .tuner_set_bandwidth = stb6100_set_bandwidth,
- .tuner_get_bandwidth = stb6100_get_bandwidth,
+ .device = STV0903, + .device = STV0903,
+ .demod_mode = STV090x_SINGLE, + .demod_mode = STV090x_SINGLE,
+ .clk_mode = STV090x_CLK_EXT, + .clk_mode = STV090x_CLK_EXT,
@ -4895,15 +4908,27 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ .tuner_set_frequency = stb6100_set_frequency, + .tuner_set_frequency = stb6100_set_frequency,
+ .tuner_set_bandwidth = stb6100_set_bandwidth, + .tuner_set_bandwidth = stb6100_set_bandwidth,
+ .tuner_get_bandwidth = stb6100_get_bandwidth, + .tuner_get_bandwidth = stb6100_get_bandwidth,
+}; };
+
+static struct stb6100_config prof_8000_stb6100_config = { static struct stb6100_config prof_8000_stb6100_config = {
- .tuner_address = 0x60,
- .refclock = 27000000,
+ .tuner_address = 0x60, + .tuner_address = 0x60,
+ .refclock = 27000000, + .refclock = 27000000,
+}; };
+
+static int p8000_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) static int p8000_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{ {
- struct cx23885_tsport *port = fe->dvb->priv;
- struct cx23885_dev *dev = port->dev;
-
- if (voltage == SEC_VOLTAGE_18)
- cx_write(MC417_RWD, 0x00001e00);
- else if (voltage == SEC_VOLTAGE_13)
- cx_write(MC417_RWD, 0x00001a00);
- else
- cx_write(MC417_RWD, 0x00001800);
- return 0;
+ struct cx23885_tsport *port = fe->dvb->priv; + struct cx23885_tsport *port = fe->dvb->priv;
+ struct cx23885_dev *dev = port->dev; + struct cx23885_dev *dev = port->dev;
+ +
@ -4914,17 +4939,28 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ else + else
+ cx_write(MC417_RWD, 0x00001800); + cx_write(MC417_RWD, 0x00001800);
+ return 0; + return 0;
+} }
+
static int cx23885_dvb_set_frontend(struct dvb_frontend *fe) static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)
{ @@ -1250,21 +1339,57 @@ static int dvb_register(struct cx23885_tsport *port)
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
@@ -1225,23 +1315,79 @@
&tevii_ds3000_config, &tevii_ds3000_config,
&i2c_bus->i2c_adap); &i2c_bus->i2c_adap);
break; break;
- case CX23885_BOARD_PROF_8000: - case CX23885_BOARD_PROF_8000:
- i2c_bus = &dev->i2c_bus[0]; - i2c_bus = &dev->i2c_bus[0];
-
- fe0->dvb.frontend = dvb_attach(stv090x_attach,
- &prof_8000_stv090x_config,
- &i2c_bus->i2c_adap,
- STV090x_DEMODULATOR_0);
- if (fe0->dvb.frontend != NULL) {
- if (!dvb_attach(stb6100_attach,
- fe0->dvb.frontend,
- &prof_8000_stb6100_config,
- &i2c_bus->i2c_adap))
- goto frontend_detach;
-
- fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ i2c_bus = &dev->i2c_bus[1]; + i2c_bus = &dev->i2c_bus[1];
@ -4951,17 +4987,6 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ break; + break;
+ } + }
+ break; + break;
- fe0->dvb.frontend = dvb_attach(stv090x_attach,
- &prof_8000_stv090x_config,
- &i2c_bus->i2c_adap,
- STV090x_DEMODULATOR_0);
- if (fe0->dvb.frontend != NULL) {
- if (!dvb_attach(stb6100_attach,
- fe0->dvb.frontend,
- &prof_8000_stb6100_config,
- &i2c_bus->i2c_adap))
- goto frontend_detach;
+ case CX23885_BOARD_DVBSKY_S950_CI: + case CX23885_BOARD_DVBSKY_S950_CI:
+ i2c_bus = &dev->i2c_bus[1]; + i2c_bus = &dev->i2c_bus[1];
+ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, + fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
@ -4975,8 +5000,6 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ &dvbsky_dc2800_config, + &dvbsky_dc2800_config,
+ &i2c_bus->i2c_adap); + &i2c_bus->i2c_adap);
+ break; + break;
- fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
+ case CX23885_BOARD_DVBSKY_T9580: + case CX23885_BOARD_DVBSKY_T9580:
+ switch (port->nr) { + switch (port->nr) {
+ /* port B */ + /* port B */
@ -4991,6 +5014,12 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
+ break; + break;
} }
break; break;
case CX23885_BOARD_HAUPPAUGE_HVR4400:
@@ -1278,6 +1403,25 @@ static int dvb_register(struct cx23885_tsport *port)
&hauppauge_a8293_config);
}
break;
+// seo
+ +
+ case CX23885_BOARD_PROF_8000: + case CX23885_BOARD_PROF_8000:
+ i2c_bus = &dev->i2c_bus[0]; + i2c_bus = &dev->i2c_bus[0];
@ -5012,7 +5041,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
default: default:
printk(KERN_INFO "%s: The frontend of your DVB/ATSC card " printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
" isn't supported yet\n", " isn't supported yet\n",
@@ -1289,7 +1435,7 @@ @@ -1325,7 +1469,7 @@ static int dvb_register(struct cx23885_tsport *port)
printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n", printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n",
port->nr, port->frontends.adapter.proposed_mac); port->nr, port->frontends.adapter.proposed_mac);
@ -5021,7 +5050,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
break; break;
} }
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: { case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: {
@@ -1316,6 +1462,41 @@ @@ -1352,6 +1496,41 @@ static int dvb_register(struct cx23885_tsport *port)
memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6); memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
break; break;
} }
@ -5063,7 +5092,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
} }
return ret; return ret;
@@ -1398,6 +1579,8 @@ @@ -1434,6 +1613,8 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
switch (port->dev->board) { switch (port->dev->board) {
case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@ -5072,38 +5101,15 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
netup_ci_exit(port); netup_ci_exit(port);
break; break;
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
diff -urN a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
--- a/drivers/media/pci/cx23885/cx23885.h 2013-03-21 04:11:19.000000000 +0800 index 7875dfb..e3f0286 100644
+++ b/drivers/media/pci/cx23885/cx23885.h 2013-04-23 22:18:24.000000000 +0800 --- a/drivers/media/pci/cx23885/cx23885-input.c
@@ -91,6 +91,12 @@ +++ b/drivers/media/pci/cx23885/cx23885-input.c
#define CX23885_BOARD_TEVII_S471 35 @@ -90,6 +90,13 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
#define CX23885_BOARD_HAUPPAUGE_HVR1255_22111 36
#define CX23885_BOARD_PROF_8000 37
+#define CX23885_BOARD_BST_PS8512 38
+#define CX23885_BOARD_DVBSKY_S952 39
+#define CX23885_BOARD_DVBSKY_S950 40
+#define CX23885_BOARD_DVBSKY_S950_CI 41
+#define CX23885_BOARD_DVBSKY_C2800E_CI 42
+#define CX23885_BOARD_DVBSKY_T9580 43
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
@@ -229,7 +235,7 @@
*/
u32 clk_freq;
struct cx23885_input input[MAX_CX23885_INPUT];
- int ci_type; /* for NetUP */
+ int ci_type; /* 1 and 2 for NetUP, 3 for DVBSky. */
/* Force bottom field first during DMA (888 workaround) */
u32 force_bff;
};
diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
--- a/drivers/media/pci/cx23885/cx23885-input.c 2013-03-21 04:11:19.000000000 +0800
+++ b/drivers/media/pci/cx23885/cx23885-input.c 2013-04-23 22:18:42.000000000 +0800
@@ -89,6 +89,12 @@
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_MYGICA_X8507:
+// seo
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ case CX23885_BOARD_DVBSKY_S952: + case CX23885_BOARD_DVBSKY_S952:
@ -5113,10 +5119,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
/* /*
* The only boards we handle right now. However other boards * The only boards we handle right now. However other boards
* using the CX2388x integrated IR controller should be similar * using the CX2388x integrated IR controller should be similar
@@ -140,6 +146,12 @@ @@ -142,6 +149,13 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
case CX23885_BOARD_HAUPPAUGE_HVR1850:
case CX23885_BOARD_HAUPPAUGE_HVR1290: case CX23885_BOARD_HAUPPAUGE_HVR1290:
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_MYGICA_X8507:
+// seo
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
+ case CX23885_BOARD_DVBSKY_S952: + case CX23885_BOARD_DVBSKY_S952:
@ -5126,9 +5133,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
/* /*
* The IR controller on this board only returns pulse widths. * The IR controller on this board only returns pulse widths.
* Any other mode setting will fail to set up the device. * Any other mode setting will fail to set up the device.
@@ -289,6 +301,18 @@ @@ -298,6 +312,18 @@ int cx23885_input_init(struct cx23885_dev *dev)
/* A guess at the remote */ /* A guess at the remote */
rc_map = RC_MAP_TEVII_NEC; rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02;
break; break;
+ case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_BST_PS8512:
+ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_DVBSKY_S950:
@ -5145,22 +5152,50 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
default: default:
return -ENODEV; return -ENODEV;
} }
diff -urN a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
--- a/drivers/media/pci/cx23885/Kconfig 2013-03-21 04:11:19.000000000 +0800 index 59c322d..dd8dfec 100644
+++ b/drivers/media/pci/cx23885/Kconfig 2013-04-23 22:20:52.000000000 +0800 --- a/drivers/media/pci/cx23885/cx23885.h
@@ -23,6 +23,8 @@ +++ b/drivers/media/pci/cx23885/cx23885.h
select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT @@ -93,6 +93,13 @@
select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT #define CX23885_BOARD_PROF_8000 37
#define CX23885_BOARD_HAUPPAUGE_HVR4400 38
#define CX23885_BOARD_AVERMEDIA_HC81R 39
+// seo
+#define CX23885_BOARD_BST_PS8512 40
+#define CX23885_BOARD_DVBSKY_S952 41
+#define CX23885_BOARD_DVBSKY_S950 42
+#define CX23885_BOARD_DVBSKY_S950_CI 43
+#define CX23885_BOARD_DVBSKY_C2800E_CI 44
+#define CX23885_BOARD_DVBSKY_T9580 45
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
@@ -231,7 +238,7 @@ struct cx23885_board {
*/
u32 clk_freq;
struct cx23885_input input[MAX_CX23885_INPUT];
- int ci_type; /* for NetUP */
+ int ci_type; /* 1 and 2 for NetUP, 3 for DVBSky. */
/* Force bottom field first during DMA (888 workaround) */
u32 force_bff;
};
diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
index bb05eca..c613fa9 100644
--- a/drivers/media/pci/cx88/Kconfig
+++ b/drivers/media/pci/cx88/Kconfig
@@ -57,6 +57,7 @@ config VIDEO_CX88_DVB
select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT + select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DC2800 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c index e2e0b8f..10b09a4 100644
--- a/drivers/media/pci/cx88/cx88-cards.c 2013-03-21 04:11:19.000000000 +0800 --- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c 2013-03-31 21:55:58.000000000 +0800 +++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -2309,6 +2309,18 @@ @@ -2309,6 +2309,18 @@ static const struct cx88_board cx88_boards[] = {
} }, } },
.mpeg = CX88_MPEG_DVB, .mpeg = CX88_MPEG_DVB,
}, },
@ -5179,7 +5214,7 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
}; };
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
@@ -2813,6 +2825,10 @@ @@ -2813,6 +2825,10 @@ static const struct cx88_subid cx88_subids[] = {
.subvendor = 0x1822, .subvendor = 0x1822,
.subdevice = 0x0023, .subdevice = 0x0023,
.card = CX88_BOARD_TWINHAN_VP1027_DVBS, .card = CX88_BOARD_TWINHAN_VP1027_DVBS,
@ -5190,7 +5225,7 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
}, },
}; };
@@ -3547,6 +3563,12 @@ @@ -3547,6 +3563,12 @@ static void cx88_card_setup(struct cx88_core *core)
cx_write(MO_SRST_IO, 1); cx_write(MO_SRST_IO, 1);
msleep(100); msleep(100);
break; break;
@ -5203,9 +5238,10 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
} /*end switch() */ } /*end switch() */
diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
--- a/drivers/media/pci/cx88/cx88-dvb.c 2013-03-21 04:11:19.000000000 +0800 index 672b267..f20979c 100644
+++ b/drivers/media/pci/cx88/cx88-dvb.c 2013-01-31 10:42:51.000000000 +0800 --- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
#include "stv0288.h" #include "stv0288.h"
#include "stb6000.h" #include "stb6000.h"
@ -5214,7 +5250,7 @@ diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.
#include "stv0900.h" #include "stv0900.h"
#include "stb6100.h" #include "stb6100.h"
#include "stb6100_proc.h" #include "stb6100_proc.h"
@@ -458,6 +459,56 @@ @@ -459,6 +460,56 @@ static int tevii_dvbs_set_voltage(struct dvb_frontend *fe,
return core->prev_set_voltage(fe, voltage); return core->prev_set_voltage(fe, voltage);
return 0; return 0;
} }
@ -5271,8 +5307,8 @@ diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.
static int vp1027_set_voltage(struct dvb_frontend *fe, static int vp1027_set_voltage(struct dvb_frontend *fe,
fe_sec_voltage_t voltage) fe_sec_voltage_t voltage)
@@ -700,6 +751,11 @@ @@ -706,6 +757,11 @@ static struct ts2020_config tevii_ts2020_config = {
.set_ts_params = ds3000_set_ts_param, .clk_out_div = 1,
}; };
+static struct m88ds3103_config dvbsky_ds3103_config = { +static struct m88ds3103_config dvbsky_ds3103_config = {
@ -5283,9 +5319,9 @@ diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.
static const struct stv0900_config prof_7301_stv0900_config = { static const struct stv0900_config prof_7301_stv0900_config = {
.demod_address = 0x6a, .demod_address = 0x6a,
/* demod_mode = 0,*/ /* demod_mode = 0,*/
@@ -1470,6 +1526,35 @@ @@ -1479,6 +1535,35 @@ static int dvb_register(struct cx8802_dev *dev)
fe0->dvb.frontend->ops.set_voltage =
tevii_dvbs_set_voltage; tevii_dvbs_set_voltage;
}
break; break;
+ case CX88_BOARD_BST_PS8312: + case CX88_BOARD_BST_PS8312:
+ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, + fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
@ -5319,21 +5355,11 @@ diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.
case CX88_BOARD_OMICOM_SS4_PCI: case CX88_BOARD_OMICOM_SS4_PCI:
case CX88_BOARD_TBS_8920: case CX88_BOARD_TBS_8920:
case CX88_BOARD_PROF_7300: case CX88_BOARD_PROF_7300:
diff -urN a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
--- a/drivers/media/pci/cx88/cx88.h 2013-03-21 04:11:19.000000000 +0800 index f29e18c..42a911c 100644
+++ b/drivers/media/pci/cx88/cx88.h 2013-01-28 13:21:36.000000000 +0800 --- a/drivers/media/pci/cx88/cx88-input.c
@@ -238,6 +238,7 @@ +++ b/drivers/media/pci/cx88/cx88-input.c
#define CX88_BOARD_WINFAST_DTV1800H_XC4000 88 @@ -419,6 +419,10 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43 90
+#define CX88_BOARD_BST_PS8312 91
enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
diff -urN a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
--- a/drivers/media/pci/cx88/cx88-input.c 2013-03-21 04:11:19.000000000 +0800
+++ b/drivers/media/pci/cx88/cx88-input.c 2013-01-26 14:52:03.000000000 +0800
@@ -419,6 +419,10 @@
rc_type = RC_BIT_NEC; rc_type = RC_BIT_NEC;
ir->sampling = 0xff00; /* address */ ir->sampling = 0xff00; /* address */
break; break;
@ -5344,21 +5370,23 @@ diff -urN a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-in
} }
if (!ir_codes) { if (!ir_codes) {
diff -urN a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
--- a/drivers/media/pci/cx88/Kconfig 2013-03-21 04:11:19.000000000 +0800 index feff53c..65d2519 100644
+++ b/drivers/media/pci/cx88/Kconfig 2013-01-31 10:42:58.000000000 +0800 --- a/drivers/media/pci/cx88/cx88.h
@@ -57,6 +57,7 @@ +++ b/drivers/media/pci/cx88/cx88.h
select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT @@ -238,6 +238,7 @@ extern const struct sram_channel cx88_sram_channels[];
select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT #define CX88_BOARD_WINFAST_DTV1800H_XC4000 88
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT #define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT #define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43 90
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT +#define CX88_BOARD_BST_PS8312 91
select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT enum cx88_itype {
diff -urN a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile CX88_VMUX_COMPOSITE1 = 1,
--- a/drivers/media/rc/keymaps/Makefile 2013-03-21 04:11:19.000000000 +0800 diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile 2013-03-31 22:22:13.000000000 +0800 index 7786619..d2019bd 100644
@@ -27,6 +27,7 @@ --- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-dm1105-nec.o \ rc-dm1105-nec.o \
rc-dntv-live-dvb-t.o \ rc-dntv-live-dvb-t.o \
rc-dntv-live-dvbt-pro.o \ rc-dntv-live-dvbt-pro.o \
@ -5366,9 +5394,11 @@ diff -urN a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefil
rc-em-terratec.o \ rc-em-terratec.o \
rc-encore-enltv2.o \ rc-encore-enltv2.o \
rc-encore-enltv.o \ rc-encore-enltv.o \
diff -urN a/drivers/media/rc/keymaps/rc-dvbsky.c b/drivers/media/rc/keymaps/rc-dvbsky.c diff --git a/drivers/media/rc/keymaps/rc-dvbsky.c b/drivers/media/rc/keymaps/rc-dvbsky.c
--- a/drivers/media/rc/keymaps/rc-dvbsky.c 1970-01-01 08:00:00.000000000 +0800 new file mode 100644
+++ b/drivers/media/rc/keymaps/rc-dvbsky.c 2013-01-26 14:52:49.000000000 +0800 index 0000000..bfc41fb
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-dvbsky.c
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
+/* rc-dvbsky.c - Keytable for Dvbsky Remote Controllers +/* rc-dvbsky.c - Keytable for Dvbsky Remote Controllers
+ * + *
@ -5448,9 +5478,40 @@ diff -urN a/drivers/media/rc/keymaps/rc-dvbsky.c b/drivers/media/rc/keymaps/rc-d
+ +
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Nibble Max <nibble.max@gmail.com>"); +MODULE_AUTHOR("Nibble Max <nibble.max@gmail.com>");
diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c 1970-01-01 08:00:00.000000000 +0800 index 692224d..27aef80 100644
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c 2013-04-23 22:23:48.000000000 +0800 --- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -149,3 +149,10 @@ config DVB_USB_RTL28XXU
help
Say Y here to support the Realtek RTL28xxU DVB USB receiver.
+config DVB_USB_DVBSKY
+ tristate "DVBSky USB2.0 support"
+ depends on DVB_USB_V2
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ help
+ Say Y here to support the USB receivers from DVBSky.
+
diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
index b76f58e..cd6431f 100644
--- a/drivers/media/usb/dvb-usb-v2/Makefile
+++ b/drivers/media/usb/dvb-usb-v2/Makefile
@@ -43,6 +43,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
dvb-usb-rtl28xxu-objs := rtl28xxu.o
obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
+dvb-usb-dvbsky-objs := dvbsky.o
+obj-$(CONFIG_DVB_USB_DVBSKY) += dvb-usb-dvbsky.o
+
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/tuners
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
new file mode 100644
index 0000000..705e406
--- /dev/null
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -0,0 +1,661 @@ @@ -0,0 +1,661 @@
+/* +/*
+ * Driver for DVBSky USB2.0 receiver + * Driver for DVBSky USB2.0 receiver
@ -6113,37 +6174,11 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
+MODULE_AUTHOR("Max nibble <nibble.max@gmail.com>"); +MODULE_AUTHOR("Max nibble <nibble.max@gmail.com>");
+MODULE_DESCRIPTION("Driver for DVBSky USB2.0"); +MODULE_DESCRIPTION("Driver for DVBSky USB2.0");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -urN a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig diff --git a/include/media/rc-map.h b/include/media/rc-map.h
--- a/drivers/media/usb/dvb-usb-v2/Kconfig 2013-03-21 04:11:19.000000000 +0800 index f74ee6f..68dbad1 100644
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig 2013-04-23 22:24:38.000000000 +0800 --- a/include/media/rc-map.h
@@ -147,3 +147,10 @@ +++ b/include/media/rc-map.h
help @@ -118,6 +118,7 @@ void rc_map_init(void);
Say Y here to support the Realtek RTL28xxU DVB USB receiver.
+config DVB_USB_DVBSKY
+ tristate "DVBSky USB2.0 support"
+ depends on DVB_USB_V2
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ help
+ Say Y here to support the USB receivers from DVBSky.
+
diff -urN a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
--- a/drivers/media/usb/dvb-usb-v2/Makefile 2013-03-21 04:11:19.000000000 +0800
+++ b/drivers/media/usb/dvb-usb-v2/Makefile 2013-02-17 12:03:00.000000000 +0800
@@ -43,6 +43,9 @@
dvb-usb-rtl28xxu-objs := rtl28xxu.o
obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
+dvb-usb-dvbsky-objs := dvbsky.o
+obj-$(CONFIG_DVB_USB_DVBSKY) += dvb-usb-dvbsky.o
+
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/tuners
diff -urN a/include/media/rc-map.h b/include/media/rc-map.h
--- a/include/media/rc-map.h 2013-03-21 04:11:19.000000000 +0800
+++ b/include/media/rc-map.h 2013-03-31 21:42:43.000000000 +0800
@@ -118,6 +118,7 @@
#define RC_MAP_DM1105_NEC "rc-dm1105-nec" #define RC_MAP_DM1105_NEC "rc-dm1105-nec"
#define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro" #define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro"
#define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t" #define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t"