|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
diff -urN a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
|
|
|
|
|
--- a/drivers/media/dvb-frontends/Kconfig 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/dvb-frontends/Kconfig 2013-04-23 22:14:23.000000000 +0800
|
|
|
|
|
--- a/drivers/media/dvb-frontends/Kconfig 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/dvb-frontends/Kconfig 2013-05-03 17:03:57.000000000 +0800
|
|
|
|
|
@@ -200,6 +200,20 @@
|
|
|
|
|
help
|
|
|
|
|
A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
|
|
|
|
@ -4376,9 +4376,9 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-fro
|
|
|
|
|
+
|
|
|
|
|
+#endif /* M88DS3103_PRIV_H */
|
|
|
|
|
diff -urN a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
|
|
|
|
|
--- a/drivers/media/dvb-frontends/Makefile 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/dvb-frontends/Makefile 2013-04-23 22:15:04.000000000 +0800
|
|
|
|
|
@@ -102,4 +102,5 @@
|
|
|
|
|
--- a/drivers/media/dvb-frontends/Makefile 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/dvb-frontends/Makefile 2013-05-03 17:04:31.000000000 +0800
|
|
|
|
|
@@ -103,4 +103,5 @@
|
|
|
|
|
obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
|
|
|
|
|
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
|
|
|
|
|
obj-$(CONFIG_DVB_AF9033) += af9033.o
|
|
|
|
@ -4386,7 +4386,7 @@ diff -urN a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/M
|
|
|
|
|
+obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o
|
|
|
|
|
+obj-$(CONFIG_DVB_M88DC2800) += m88dc2800.o
|
|
|
|
|
diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cimax2.c 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cimax2.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cimax2.c 2013-03-31 22:03:29.000000000 +0800
|
|
|
|
|
@@ -415,7 +415,7 @@
|
|
|
|
|
return state->status;
|
|
|
|
@ -4430,7 +4430,7 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax
|
|
|
|
|
+ return 1;
|
|
|
|
|
+}
|
|
|
|
|
diff -urN 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
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cimax2.h 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cimax2.h 2013-01-30 12:34:37.000000000 +0800
|
|
|
|
|
@@ -41,7 +41,9 @@
|
|
|
|
|
extern int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status);
|
|
|
|
@ -4444,17 +4444,15 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.h b/drivers/media/pci/cx23885/cimax
|
|
|
|
|
+
|
|
|
|
|
#endif
|
|
|
|
|
diff -urN 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
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-cards.c 2013-04-23 22:19:57.000000000 +0800
|
|
|
|
|
@@ -569,9 +569,37 @@
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cx23885-cards.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-cards.c 2013-05-03 17:34:46.000000000 +0800
|
|
|
|
|
@@ -569,6 +569,34 @@
|
|
|
|
|
.name = "TeVii S471",
|
|
|
|
|
.portb = CX23885_MPEG_DVB,
|
|
|
|
|
},
|
|
|
|
|
- [CX23885_BOARD_PROF_8000] = {
|
|
|
|
|
- .name = "Prof Revolution DVB-S2 8000",
|
|
|
|
|
+ [CX23885_BOARD_BST_PS8512] = {
|
|
|
|
|
+ .name = "Bestunar PS8512",
|
|
|
|
|
.portb = CX23885_MPEG_DVB,
|
|
|
|
|
+ .portb = CX23885_MPEG_DVB,
|
|
|
|
|
+ },
|
|
|
|
|
+ [CX23885_BOARD_DVBSKY_S950] = {
|
|
|
|
|
+ .name = "DVBSKY S950",
|
|
|
|
@ -4480,19 +4478,22 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
+ .portb = CX23885_MPEG_DVB,
|
|
|
|
|
+ .portc = CX23885_MPEG_DVB,
|
|
|
|
|
+ },
|
|
|
|
|
+ [CX23885_BOARD_PROF_8000] = {
|
|
|
|
|
+ .name = "Prof Revolution DVB-S2 8000",
|
|
|
|
|
+ .portb = CX23885_MPEG_DVB,
|
|
|
|
|
}
|
|
|
|
|
[CX23885_BOARD_PROF_8000] = {
|
|
|
|
|
.name = "Prof Revolution DVB-S2 8000",
|
|
|
|
|
.portb = CX23885_MPEG_DVB,
|
|
|
|
|
@@ -605,7 +633,7 @@
|
|
|
|
|
CX25840_NONE1_CH3,
|
|
|
|
|
.amux = CX25840_AUDIO6,
|
|
|
|
|
} },
|
|
|
|
|
- }
|
|
|
|
|
+ }
|
|
|
|
|
};
|
|
|
|
|
const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
|
|
|
|
|
@@ -785,9 +813,33 @@
|
|
|
|
|
|
|
|
|
|
@@ -818,6 +846,30 @@
|
|
|
|
|
.subdevice = 0x9022,
|
|
|
|
|
.card = CX23885_BOARD_TEVII_S471,
|
|
|
|
|
}, {
|
|
|
|
|
- .subvendor = 0x8000,
|
|
|
|
|
- .subdevice = 0x3034,
|
|
|
|
|
- .card = CX23885_BOARD_PROF_8000,
|
|
|
|
|
+ .subvendor = 0x14f1,
|
|
|
|
|
+ .subdevice = 0x8512,
|
|
|
|
|
+ .card = CX23885_BOARD_BST_PS8512,
|
|
|
|
@ -4516,14 +4517,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
+ .subvendor = 0x4254,
|
|
|
|
|
+ .subdevice = 0x9580,
|
|
|
|
|
+ .card = CX23885_BOARD_DVBSKY_T9580,
|
|
|
|
|
+ }, {
|
|
|
|
|
+ .subvendor = 0x8000,
|
|
|
|
|
+ .subdevice = 0x3034,
|
|
|
|
|
+ .card = CX23885_BOARD_PROF_8000,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
|
|
|
|
|
@@ -1167,7 +1219,7 @@
|
|
|
|
|
+ }, {
|
|
|
|
|
.subvendor = 0x8000,
|
|
|
|
|
.subdevice = 0x3034,
|
|
|
|
|
.card = CX23885_BOARD_PROF_8000,
|
|
|
|
|
@@ -1224,7 +1276,7 @@
|
|
|
|
|
cx_set(GP0_IO, 0x00040004);
|
|
|
|
|
break;
|
|
|
|
|
case CX23885_BOARD_TBS_6920:
|
|
|
|
@ -4532,9 +4530,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
cx_write(MC417_CTL, 0x00000036);
|
|
|
|
|
cx_write(MC417_OEN, 0x00001000);
|
|
|
|
|
cx_set(MC417_RWD, 0x00000002);
|
|
|
|
|
@@ -1301,9 +1353,84 @@
|
|
|
|
|
/* enable irq */
|
|
|
|
|
cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/
|
|
|
|
|
@@ -1394,9 +1446,84 @@
|
|
|
|
|
cx_set(GP0_IO, 0x00040004);
|
|
|
|
|
mdelay(60);
|
|
|
|
|
break;
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950:
|
|
|
|
|
+ case CX23885_BOARD_BST_PS8512:
|
|
|
|
@ -4617,7 +4615,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
int cx23885_ir_init(struct cx23885_dev *dev)
|
|
|
|
|
{
|
|
|
|
|
static struct v4l2_subdev_io_pin_config ir_rxtx_pin_cfg[] = {
|
|
|
|
|
@@ -1388,6 +1515,23 @@
|
|
|
|
|
@@ -1482,6 +1609,23 @@
|
|
|
|
|
v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
|
|
|
|
|
ir_rx_pin_cfg_count, ir_rx_pin_cfg);
|
|
|
|
|
break;
|
|
|
|
@ -4641,33 +4639,37 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
if (!enable_885_ir)
|
|
|
|
|
break;
|
|
|
|
|
@@ -1420,6 +1564,12 @@
|
|
|
|
|
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
|
|
|
|
|
case CX23885_BOARD_TEVII_S470:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
@@ -1511,9 +1655,15 @@
|
|
|
|
|
cx23888_ir_remove(dev);
|
|
|
|
|
dev->sd_ir = NULL;
|
|
|
|
|
break;
|
|
|
|
|
+ case CX23885_BOARD_BST_PS8512:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S952:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_C2800E_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
|
|
|
|
|
case CX23885_BOARD_TEVII_S470:
|
|
|
|
|
- case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
+ case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
case CX23885_BOARD_MYGICA_X8507:
|
|
|
|
|
cx23885_irq_remove(dev, PCI_MSK_AV_CORE);
|
|
|
|
|
/* sd_ir is a duplicate pointer to the AV Core, just clear it */
|
|
|
|
|
dev->sd_ir = NULL;
|
|
|
|
|
@@ -1464,6 +1614,12 @@
|
|
|
|
|
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
|
|
|
|
|
case CX23885_BOARD_TEVII_S470:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
@@ -1556,6 +1706,12 @@
|
|
|
|
|
if (dev->sd_ir)
|
|
|
|
|
cx23885_irq_add_enable(dev, PCI_MSK_IR);
|
|
|
|
|
break;
|
|
|
|
|
+ case CX23885_BOARD_BST_PS8512:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S952:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_C2800E_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
if (dev->sd_ir)
|
|
|
|
|
cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
|
|
|
|
|
break;
|
|
|
|
|
@@ -1549,6 +1705,10 @@
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
|
|
|
|
|
case CX23885_BOARD_TEVII_S470:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
@@ -1657,6 +1813,10 @@
|
|
|
|
|
ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
|
|
|
|
|
ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
|
|
|
|
|
break;
|
|
|
|
@ -4678,9 +4680,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_S471:
|
|
|
|
|
case CX23885_BOARD_DVBWORLD_2005:
|
|
|
|
|
@@ -1581,6 +1741,22 @@
|
|
|
|
|
ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
|
|
|
|
|
ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
|
|
|
|
|
@@ -1694,6 +1854,22 @@
|
|
|
|
|
ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
|
|
|
|
|
ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
|
|
|
|
|
break;
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S952:
|
|
|
|
|
+ ts1->gen_ctrl_val = 0x5; /* Parallel */
|
|
|
|
@ -4701,7 +4703,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1500:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
|
|
|
|
|
@@ -1636,6 +1812,12 @@
|
|
|
|
|
@@ -1749,6 +1925,12 @@
|
|
|
|
|
case CX23885_BOARD_MPX885:
|
|
|
|
|
case CX23885_BOARD_MYGICA_X8507:
|
|
|
|
|
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
|
|
|
|
@ -4711,12 +4713,12 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_C2800E_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
case CX23885_BOARD_AVERMEDIA_HC81R:
|
|
|
|
|
dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
|
|
|
|
|
&dev->i2c_bus[2].i2c_adap,
|
|
|
|
|
"cx25840", 0x88 >> 1, NULL);
|
|
|
|
|
diff -urN 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
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-core.c 2013-04-23 22:19:04.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cx23885-core.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-core.c 2013-05-03 17:36:31.000000000 +0800
|
|
|
|
|
@@ -1909,6 +1909,10 @@
|
|
|
|
|
(pci_status & PCI_MSK_GPIO0))
|
|
|
|
|
handled += altera_ci_irq(dev);
|
|
|
|
@ -4738,8 +4740,8 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
diff -urN 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
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c 2013-04-23 22:48:39.797116340 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cx23885-dvb.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c 2013-05-03 17:38:34.000000000 +0800
|
|
|
|
|
@@ -51,6 +51,8 @@
|
|
|
|
|
#include "stv6110.h"
|
|
|
|
|
#include "lnbh24.h"
|
|
|
|
@ -4749,7 +4751,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
#include "cimax2.h"
|
|
|
|
|
#include "lgs8gxx.h"
|
|
|
|
|
#include "netup-eeprom.h"
|
|
|
|
|
@@ -63,8 +65,8 @@
|
|
|
|
|
@@ -64,8 +66,8 @@
|
|
|
|
|
#include "stv0367.h"
|
|
|
|
|
#include "drxk.h"
|
|
|
|
|
#include "mt2063.h"
|
|
|
|
@ -4758,34 +4760,34 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
+#include "stv090x.h"
|
|
|
|
|
+#include "stb6100.h"
|
|
|
|
|
#include "stb6100_cfg.h"
|
|
|
|
|
|
|
|
|
|
static unsigned int debug;
|
|
|
|
|
@@ -492,42 +494,130 @@
|
|
|
|
|
#include "tda10071.h"
|
|
|
|
|
#include "a8293.h"
|
|
|
|
|
@@ -500,42 +502,130 @@
|
|
|
|
|
.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,
|
|
|
|
|
- .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,
|
|
|
|
|
- .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 */
|
|
|
|
|
+int bst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
|
|
|
|
@ -4919,7 +4921,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)
|
|
|
|
|
{
|
|
|
|
|
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
|
|
|
|
|
@@ -1225,23 +1315,79 @@
|
|
|
|
|
@@ -1250,23 +1340,79 @@
|
|
|
|
|
&tevii_ds3000_config,
|
|
|
|
|
&i2c_bus->i2c_adap);
|
|
|
|
|
break;
|
|
|
|
@ -5009,10 +5011,10 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
+ fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
|
|
|
|
|
+ }
|
|
|
|
|
+ break;
|
|
|
|
|
default:
|
|
|
|
|
printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
|
|
|
|
|
" isn't supported yet\n",
|
|
|
|
|
@@ -1289,7 +1435,7 @@
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR4400:
|
|
|
|
|
i2c_bus = &dev->i2c_bus[0];
|
|
|
|
|
fe0->dvb.frontend = dvb_attach(tda10071_attach,
|
|
|
|
|
@@ -1325,7 +1471,7 @@
|
|
|
|
|
printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n",
|
|
|
|
|
port->nr, port->frontends.adapter.proposed_mac);
|
|
|
|
|
|
|
|
|
@ -5021,7 +5023,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: {
|
|
|
|
|
@@ -1316,6 +1462,41 @@
|
|
|
|
|
@@ -1352,6 +1498,41 @@
|
|
|
|
|
memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -5063,7 +5065,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
@@ -1398,6 +1579,8 @@
|
|
|
|
|
@@ -1434,6 +1615,8 @@
|
|
|
|
|
|
|
|
|
|
switch (port->dev->board) {
|
|
|
|
|
case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
|
|
|
|
@ -5073,22 +5075,24 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
|
|
|
|
|
break;
|
|
|
|
|
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
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cx23885.h 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885.h 2013-04-23 22:18:24.000000000 +0800
|
|
|
|
|
@@ -91,6 +91,12 @@
|
|
|
|
|
#define CX23885_BOARD_TEVII_S471 35
|
|
|
|
|
#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
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cx23885.h 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885.h 2013-05-03 17:14:20.000000000 +0800
|
|
|
|
|
@@ -94,6 +94,14 @@
|
|
|
|
|
#define CX23885_BOARD_HAUPPAUGE_HVR4400 38
|
|
|
|
|
#define CX23885_BOARD_AVERMEDIA_HC81R 39
|
|
|
|
|
|
|
|
|
|
+#define CX23885_BOARD_BASE_INDEX 40
|
|
|
|
|
+#define CX23885_BOARD_BST_PS8512 (CX23885_BOARD_BASE_INDEX)
|
|
|
|
|
+#define CX23885_BOARD_DVBSKY_S952 (CX23885_BOARD_BASE_INDEX+1)
|
|
|
|
|
+#define CX23885_BOARD_DVBSKY_S950 (CX23885_BOARD_BASE_INDEX+2)
|
|
|
|
|
+#define CX23885_BOARD_DVBSKY_S950_CI (CX23885_BOARD_BASE_INDEX+3)
|
|
|
|
|
+#define CX23885_BOARD_DVBSKY_C2800E_CI (CX23885_BOARD_BASE_INDEX+4)
|
|
|
|
|
+#define CX23885_BOARD_DVBSKY_T9580 (CX23885_BOARD_BASE_INDEX+5)
|
|
|
|
|
+
|
|
|
|
|
#define GPIO_0 0x00000001
|
|
|
|
|
#define GPIO_1 0x00000002
|
|
|
|
|
@@ -229,7 +235,7 @@
|
|
|
|
|
#define GPIO_2 0x00000004
|
|
|
|
|
@@ -231,7 +239,7 @@
|
|
|
|
|
*/
|
|
|
|
|
u32 clk_freq;
|
|
|
|
|
struct cx23885_input input[MAX_CX23885_INPUT];
|
|
|
|
@ -5098,8 +5102,8 @@ diff -urN a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23
|
|
|
|
|
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
|
|
|
|
|
--- a/drivers/media/pci/cx23885/cx23885-input.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/cx23885-input.c 2013-05-03 17:42:09.000000000 +0800
|
|
|
|
|
@@ -89,6 +89,12 @@
|
|
|
|
|
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
|
|
|
|
|
case CX23885_BOARD_TEVII_S470:
|
|
|
|
@ -5110,10 +5114,10 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_C2800E_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
case CX23885_BOARD_MYGICA_X8507:
|
|
|
|
|
/*
|
|
|
|
|
* The only boards we handle right now. However other boards
|
|
|
|
|
* using the CX2388x integrated IR controller should be similar
|
|
|
|
|
@@ -140,6 +146,12 @@
|
|
|
|
|
@@ -141,6 +147,12 @@
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1850:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1290:
|
|
|
|
|
case CX23885_BOARD_HAUPPAUGE_HVR1250:
|
|
|
|
@ -5123,10 +5127,10 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_S950_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_C2800E_CI:
|
|
|
|
|
+ case CX23885_BOARD_DVBSKY_T9580:
|
|
|
|
|
case CX23885_BOARD_MYGICA_X8507:
|
|
|
|
|
/*
|
|
|
|
|
* The IR controller on this board only returns pulse widths.
|
|
|
|
|
* Any other mode setting will fail to set up the device.
|
|
|
|
|
@@ -289,6 +301,18 @@
|
|
|
|
|
@@ -291,6 +303,18 @@
|
|
|
|
|
/* A guess at the remote */
|
|
|
|
|
rc_map = RC_MAP_TEVII_NEC;
|
|
|
|
|
break;
|
|
|
|
@ -5142,12 +5146,12 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
|
|
|
|
|
+ /* A guess at the remote */
|
|
|
|
|
+ rc_map = RC_MAP_DVBSKY;
|
|
|
|
|
+ break;
|
|
|
|
|
default:
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
case CX23885_BOARD_MYGICA_X8507:
|
|
|
|
|
/* Integrated CX23885 IR controller */
|
|
|
|
|
driver_type = RC_DRIVER_IR_RAW;
|
|
|
|
|
diff -urN a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
|
|
|
|
|
--- a/drivers/media/pci/cx23885/Kconfig 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/Kconfig 2013-04-23 22:20:52.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx23885/Kconfig 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx23885/Kconfig 2013-05-03 17:43:05.000000000 +0800
|
|
|
|
|
@@ -23,6 +23,8 @@
|
|
|
|
|
select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
@ -5156,10 +5160,10 @@ diff -urN a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfi
|
|
|
|
|
+ select DVB_M88DC2800 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
|
|
|
|
|
--- a/drivers/media/pci/cx88/cx88-cards.c 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/cx88-cards.c 2013-03-31 21:55:58.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx88/cx88-cards.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/cx88-cards.c 2013-05-03 17:06:55.000000000 +0800
|
|
|
|
|
@@ -2309,6 +2309,18 @@
|
|
|
|
|
} },
|
|
|
|
|
.mpeg = CX88_MPEG_DVB,
|
|
|
|
@ -5204,8 +5208,8 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -urN 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
|
|
|
|
|
+++ b/drivers/media/pci/cx88/cx88-dvb.c 2013-01-31 10:42:51.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx88/cx88-dvb.c 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/cx88-dvb.c 2013-05-03 17:09:09.000000000 +0800
|
|
|
|
|
@@ -54,6 +54,7 @@
|
|
|
|
|
#include "stv0288.h"
|
|
|
|
|
#include "stb6000.h"
|
|
|
|
@ -5214,7 +5218,7 @@ diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.
|
|
|
|
|
#include "stv0900.h"
|
|
|
|
|
#include "stb6100.h"
|
|
|
|
|
#include "stb6100_proc.h"
|
|
|
|
|
@@ -458,6 +459,56 @@
|
|
|
|
|
@@ -459,6 +460,56 @@
|
|
|
|
|
return core->prev_set_voltage(fe, voltage);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
@ -5271,8 +5275,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,
|
|
|
|
|
fe_sec_voltage_t voltage)
|
|
|
|
|
@@ -700,6 +751,11 @@
|
|
|
|
|
.set_ts_params = ds3000_set_ts_param,
|
|
|
|
|
@@ -706,6 +757,11 @@
|
|
|
|
|
.clk_out_div = 1,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
+static struct m88ds3103_config dvbsky_ds3103_config = {
|
|
|
|
@ -5283,10 +5287,12 @@ 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 = {
|
|
|
|
|
.demod_address = 0x6a,
|
|
|
|
|
/* demod_mode = 0,*/
|
|
|
|
|
@@ -1470,6 +1526,35 @@
|
|
|
|
|
@@ -1477,6 +1533,35 @@
|
|
|
|
|
&tevii_ts2020_config, &core->i2c_adap);
|
|
|
|
|
fe0->dvb.frontend->ops.set_voltage =
|
|
|
|
|
tevii_dvbs_set_voltage;
|
|
|
|
|
break;
|
|
|
|
|
+ }
|
|
|
|
|
+ break;
|
|
|
|
|
+ case CX88_BOARD_BST_PS8312:
|
|
|
|
|
+ fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
|
|
|
|
|
+ &dvbsky_ds3103_config,
|
|
|
|
@ -5314,14 +5320,12 @@ diff -urN a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.
|
|
|
|
|
+ fe0->dvb.frontend->ops.set_voltage = bst_dvbs_set_voltage_v2;
|
|
|
|
|
+ else
|
|
|
|
|
+ fe0->dvb.frontend->ops.set_voltage = bst_dvbs_set_voltage;
|
|
|
|
|
+ }
|
|
|
|
|
+ break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case CX88_BOARD_OMICOM_SS4_PCI:
|
|
|
|
|
case CX88_BOARD_TBS_8920:
|
|
|
|
|
case CX88_BOARD_PROF_7300:
|
|
|
|
|
diff -urN a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
|
|
|
|
|
--- a/drivers/media/pci/cx88/cx88.h 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/cx88.h 2013-01-28 13:21:36.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx88/cx88.h 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/cx88.h 2013-05-03 17:05:57.000000000 +0800
|
|
|
|
|
@@ -238,6 +238,7 @@
|
|
|
|
|
#define CX88_BOARD_WINFAST_DTV1800H_XC4000 88
|
|
|
|
|
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89
|
|
|
|
@ -5331,7 +5335,7 @@ diff -urN a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
|
|
|
|
|
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
|
|
|
|
|
--- a/drivers/media/pci/cx88/cx88-input.c 2013-04-29 08:36:01.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;
|
|
|
|
@ -5345,8 +5349,8 @@ diff -urN a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-in
|
|
|
|
|
|
|
|
|
|
if (!ir_codes) {
|
|
|
|
|
diff -urN a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
|
|
|
|
|
--- a/drivers/media/pci/cx88/Kconfig 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/Kconfig 2013-01-31 10:42:58.000000000 +0800
|
|
|
|
|
--- a/drivers/media/pci/cx88/Kconfig 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/pci/cx88/Kconfig 2013-05-03 17:10:41.000000000 +0800
|
|
|
|
|
@@ -57,6 +57,7 @@
|
|
|
|
|
select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
@ -5356,8 +5360,8 @@ diff -urN a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
|
|
|
|
|
select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT
|
|
|
|
|
diff -urN a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
|
|
|
|
|
--- a/drivers/media/rc/keymaps/Makefile 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/rc/keymaps/Makefile 2013-03-31 22:22:13.000000000 +0800
|
|
|
|
|
--- a/drivers/media/rc/keymaps/Makefile 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/rc/keymaps/Makefile 2013-05-03 17:43:41.000000000 +0800
|
|
|
|
|
@@ -27,6 +27,7 @@
|
|
|
|
|
rc-dm1105-nec.o \
|
|
|
|
|
rc-dntv-live-dvb-t.o \
|
|
|
|
@ -5450,8 +5454,8 @@ diff -urN a/drivers/media/rc/keymaps/rc-dvbsky.c b/drivers/media/rc/keymaps/rc-d
|
|
|
|
|
+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
|
|
|
|
|
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c 1970-01-01 08:00:00.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c 2013-04-23 22:23:48.000000000 +0800
|
|
|
|
|
@@ -0,0 +1,661 @@
|
|
|
|
|
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c 2013-05-03 17:47:38.000000000 +0800
|
|
|
|
|
@@ -0,0 +1,665 @@
|
|
|
|
|
+/*
|
|
|
|
|
+ * Driver for DVBSky USB2.0 receiver
|
|
|
|
|
+ *
|
|
|
|
@ -5916,6 +5920,7 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
|
|
|
|
|
+ .functionality = dvbsky_i2c_func,
|
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
|
|
+#if IS_ENABLED(CONFIG_RC_CORE)
|
|
|
|
|
+static int dvbsky_rc_query(struct dvb_usb_device *d)
|
|
|
|
|
+{
|
|
|
|
|
+ u32 code = 0xffff;
|
|
|
|
@ -5942,6 +5947,9 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
|
|
|
|
|
+ rc->interval = 300;
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
+#else
|
|
|
|
|
+ #define dvbsky_get_rc_config NULL
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
+static int dvbsky_sync_ctrl(struct dvb_frontend *fe)
|
|
|
|
|
+{
|
|
|
|
@ -6114,9 +6122,9 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
|
|
|
|
|
+MODULE_DESCRIPTION("Driver for DVBSky USB2.0");
|
|
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
|
|
diff -urN a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
|
|
|
|
|
--- a/drivers/media/usb/dvb-usb-v2/Kconfig 2013-03-21 04:11:19.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig 2013-04-23 22:24:38.000000000 +0800
|
|
|
|
|
@@ -147,3 +147,10 @@
|
|
|
|
|
--- a/drivers/media/usb/dvb-usb-v2/Kconfig 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig 2013-05-03 17:45:35.000000000 +0800
|
|
|
|
|
@@ -149,3 +149,10 @@
|
|
|
|
|
help
|
|
|
|
|
Say Y here to support the Realtek RTL28xxU DVB USB receiver.
|
|
|
|
|
|
|
|
|
@ -6128,7 +6136,7 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/
|
|
|
|
|
+ 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
|
|
|
|
|
--- a/drivers/media/usb/dvb-usb-v2/Makefile 2013-04-29 08:36:01.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
|
|
|
|
@ -6141,8 +6149,8 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2
|
|
|
|
|
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
|
|
|
|
|
--- a/include/media/rc-map.h 2013-04-29 08:36:01.000000000 +0800
|
|
|
|
|
+++ b/include/media/rc-map.h 2013-05-03 17:02:46.000000000 +0800
|
|
|
|
|
@@ -118,6 +118,7 @@
|
|
|
|
|
#define RC_MAP_DM1105_NEC "rc-dm1105-nec"
|
|
|
|
|
#define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro"
|