From e1e7af575cc1066e49511eff335b705a05bbaccd Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 18 Dec 2013 16:16:31 +0200
Subject: [PATCH] linux: update dvbsky patch

thanks to Max nibble
---
 .../patches/3.12.5/linux-210-dvbsky.patch     | 460 ++++++++----------
 .../3.12.5/linux-210.01-dvbsky-auto-off.patch |  31 --
 2 files changed, 200 insertions(+), 291 deletions(-)
 delete mode 100644 packages/linux/patches/3.12.5/linux-210.01-dvbsky-auto-off.patch

diff --git a/packages/linux/patches/3.12.5/linux-210-dvbsky.patch b/packages/linux/patches/3.12.5/linux-210-dvbsky.patch
index 97683e9275..0c3bbc31a8 100644
--- a/packages/linux/patches/3.12.5/linux-210-dvbsky.patch
+++ b/packages/linux/patches/3.12.5/linux-210-dvbsky.patch
@@ -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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/dvb-frontends/Kconfig	2013-05-03 17:03:57.000000000 +0800
+--- a/drivers/media/dvb-frontends/Kconfig	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/dvb-frontends/Kconfig	2013-12-18 19:59:34.694846566 +0800
 @@ -200,6 +200,20 @@
  	help
  	  A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
@@ -24,7 +24,7 @@ diff -urN a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kc
  	depends on DVB_CORE && I2C
 diff -urN a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontends/m88dc2800.c
 --- a/drivers/media/dvb-frontends/m88dc2800.c	1970-01-01 08:00:00.000000000 +0800
-+++ b/drivers/media/dvb-frontends/m88dc2800.c	2013-01-26 16:03:21.000000000 +0800
++++ b/drivers/media/dvb-frontends/m88dc2800.c	2013-12-18 19:59:39.354846514 +0800
 @@ -0,0 +1,2124 @@
 +/*
 +    M88DC2800/M88TC2800  - DVB-C demodulator and tuner from Montage
@@ -2152,8 +2152,8 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontend
 +MODULE_VERSION("1.00");
 diff -urN 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
-+++ b/drivers/media/dvb-frontends/m88dc2800.h	2013-01-26 14:57:32.000000000 +0800
-@@ -0,0 +1,43 @@
++++ b/drivers/media/dvb-frontends/m88dc2800.h	2013-12-18 19:59:43.174846471 +0800
+@@ -0,0 +1,44 @@
 +/*
 +    M88DC2800/M88TC2800  - DVB-C demodulator and tuner from Montage
 +
@@ -2178,6 +2178,7 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontend
 +#ifndef M88DC2800_H
 +#define M88DC2800_H
 +
++#include <linux/kconfig.h>
 +#include <linux/dvb/frontend.h>
 +
 +struct m88dc2800_config {
@@ -2185,7 +2186,7 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontend
 +	u8 ts_mode;
 +};
 +
-+#if defined(CONFIG_DVB_M88DC2800) || (defined(CONFIG_DVB_M88DC2800_MODULE) && defined(MODULE))
++#if IS_ENABLED(CONFIG_DVB_M88DC2800)
 +extern struct dvb_frontend* m88dc2800_attach(const struct m88dc2800_config* config,
 +					    struct i2c_adapter* i2c);
 +#else
@@ -2199,8 +2200,8 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontend
 +#endif /* M88DC2800_H */
 diff -urN 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
-+++ b/drivers/media/dvb-frontends/m88ds3103.c	2013-01-30 12:33:47.000000000 +0800
-@@ -0,0 +1,1710 @@
++++ b/drivers/media/dvb-frontends/m88ds3103.c	2013-12-18 19:59:46.950846428 +0800
+@@ -0,0 +1,1707 @@
 +/*
 +    Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
 +
@@ -3315,8 +3316,12 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontend
 +			m88ds3103_writereg(state, 0x22, val1);
 +			m88ds3103_writereg(state, 0x24, val2);	
 +			
-+			if(state->config->ci_mode)
-+				val1 = 0x03;
++			if(state->config->ci_mode){
++				if(state->config->ci_mode == 2)
++					val1 = 0x43;
++				else
++					val1 = 0x03;
++			}
 +			else if(state->config->ts_mode)
 +				val1 = 0x06;
 +			else
@@ -3381,8 +3386,12 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontend
 +			m88ds3103_writereg(state, 0x24, val2);					
 +		}
 +		
-+		if(state->config->ci_mode)
-+			val1 = 0x03;
++		if(state->config->ci_mode){
++			if(state->config->ci_mode == 2)
++				val1 = 0x43;
++			else
++				val1 = 0x03;
++		}
 +		else if(state->config->ts_mode)
 +			val1 = 0x06;
 +		else
@@ -3447,6 +3456,8 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontend
 +	dprintk("symbol rate = %d\n", c->symbol_rate);
 +	dprintk("delivery system = %d\n", c->delivery_system);
 +	
++	state->delivery_system = c->delivery_system;
++	
 +	realFreq = c->frequency;
 +	lpf_offset_KHz = 0;
 +	if(c->symbol_rate < 5000000){
@@ -3705,19 +3716,6 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontend
 +		msleep(20);
 +	}
 +	
-+	if((status & FE_HAS_LOCK) == 0){
-+		state->delivery_system = (state->delivery_system == SYS_DVBS) ? SYS_DVBS2 : SYS_DVBS;
-+		m88ds3103_demod_connect(fe, offset_khz);
-+	
-+		for (i = 0; i < 30 ; i++) {
-+			m88ds3103_read_status(fe, &status);
-+			if (status & FE_HAS_LOCK){
-+				break;
-+                	}
-+			msleep(20);
-+		}
-+	}
-+	
 +	if (status & FE_HAS_LOCK){
 +		if(state->config->ci_mode == 2)
 +			m88ds3103_set_clock_ratio(state);
@@ -3913,7 +3911,7 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontend
 +MODULE_LICENSE("GPL");
 diff -urN 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
-+++ b/drivers/media/dvb-frontends/m88ds3103.h	2013-01-30 12:33:51.000000000 +0800
++++ b/drivers/media/dvb-frontends/m88ds3103.h	2013-12-18 20:00:00.866846272 +0800
 @@ -0,0 +1,53 @@
 +/*
 +    Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@@ -3936,6 +3934,7 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontend
 +#ifndef M88DS3103_H
 +#define M88DS3103_H
 +
++#include <linux/kconfig.h>
 +#include <linux/dvb/frontend.h>
 +
 +struct m88ds3103_config {
@@ -3953,8 +3952,7 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontend
 +    int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
 +};
 +
-+#if defined(CONFIG_DVB_M88DS3103) || \
-+	(defined(CONFIG_DVB_M88DS3103_MODULE) && defined(MODULE))
++#if IS_ENABLED(CONFIG_DVB_M88DS3103)
 +extern struct dvb_frontend *m88ds3103_attach(
 +       const struct m88ds3103_config *config,
 +       struct i2c_adapter *i2c);
@@ -3970,7 +3968,7 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontend
 +#endif /* M88DS3103_H */
 diff -urN 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
-+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h	2013-01-30 12:33:56.000000000 +0800
++++ b/drivers/media/dvb-frontends/m88ds3103_priv.h	2013-12-18 20:00:05.458846220 +0800
 @@ -0,0 +1,403 @@
 +/*
 +    Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@@ -4376,8 +4374,8 @@ 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/dvb-frontends/Makefile	2013-05-03 17:04:31.000000000 +0800
+--- a/drivers/media/dvb-frontends/Makefile	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/dvb-frontends/Makefile	2013-12-18 20:00:11.726846150 +0800
 @@ -103,4 +103,5 @@
  obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
  obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
@@ -4386,9 +4384,9 @@ 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-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 @@
+--- a/drivers/media/pci/cx23885/cimax2.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cimax2.c	2013-12-18 20:01:45.986845090 +0800
+@@ -426,7 +426,7 @@
  	return state->status;
  }
  
@@ -4397,7 +4395,7 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax
  {
  	struct netup_ci_state *state;
  	u8 cimax_init[34] = {
-@@ -464,6 +464,11 @@
+@@ -475,6 +475,11 @@
  		goto err;
  	}
  
@@ -4409,7 +4407,7 @@ diff -urN a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax
  	port->port_priv = state;
  
  	switch (port->nr) {
-@@ -537,3 +542,19 @@
+@@ -548,3 +553,19 @@
  	dvb_ca_en50221_release(&state->ca);
  	kfree(state);
  }
@@ -4430,8 +4428,8 @@ 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/cimax2.h	2013-01-30 12:34:37.000000000 +0800
+--- a/drivers/media/pci/cx23885/cimax2.h	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cimax2.h	2013-12-18 20:01:51.530845028 +0800
 @@ -41,7 +41,9 @@
  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,
@@ -4444,9 +4442,9 @@ 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-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 @@
+--- a/drivers/media/pci/cx23885/cx23885-cards.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cx23885-cards.c	2013-12-18 20:02:02.178844908 +0800
+@@ -570,6 +570,34 @@
  		.name		= "TeVii S471",
  		.portb		= CX23885_MPEG_DVB,
  	},
@@ -4481,16 +4479,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
  	[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);
- 
-@@ -818,6 +846,30 @@
+@@ -819,6 +847,30 @@
  		.subdevice = 0x9022,
  		.card      = CX23885_BOARD_TEVII_S471,
  	}, {
@@ -4521,16 +4510,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
  		.subvendor = 0x8000,
  		.subdevice = 0x3034,
  		.card      = CX23885_BOARD_PROF_8000,
-@@ -1224,7 +1276,7 @@
- 		cx_set(GP0_IO, 0x00040004);
- 		break;
- 	case CX23885_BOARD_TBS_6920:
--	case CX23885_BOARD_PROF_8000:
-+	case CX23885_BOARD_PROF_8000:	
- 		cx_write(MC417_CTL, 0x00000036);
- 		cx_write(MC417_OEN, 0x00001000);
- 		cx_set(MC417_RWD, 0x00000002);
-@@ -1394,9 +1446,84 @@
+@@ -1395,9 +1447,84 @@
  		cx_set(GP0_IO, 0x00040004);
  		mdelay(60);
  		break;
@@ -4615,7 +4595,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[] = {
-@@ -1482,6 +1609,23 @@
+@@ -1483,6 +1610,23 @@
  		v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
  				 ir_rx_pin_cfg_count, ir_rx_pin_cfg);
  		break;
@@ -4639,7 +4619,7 @@ 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;
-@@ -1511,9 +1655,15 @@
+@@ -1512,6 +1656,12 @@
  		cx23888_ir_remove(dev);
  		dev->sd_ir = NULL;
  		break;
@@ -4651,12 +4631,8 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
 +	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 */
-@@ -1556,6 +1706,12 @@
+ 	case CX23885_BOARD_HAUPPAUGE_HVR1250:
+@@ -1557,6 +1707,12 @@
  		if (dev->sd_ir)
  			cx23885_irq_add_enable(dev, PCI_MSK_IR);
  		break;
@@ -4669,7 +4645,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
  	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
  	case CX23885_BOARD_TEVII_S470:
  	case CX23885_BOARD_HAUPPAUGE_HVR1250:
-@@ -1657,6 +1813,10 @@
+@@ -1658,6 +1814,10 @@
  		ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
  		ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
  		break;
@@ -4680,7 +4656,7 @@ 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:
-@@ -1694,6 +1854,22 @@
+@@ -1696,6 +1856,22 @@
  		ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
  		ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
  		break;
@@ -4703,7 +4679,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:
-@@ -1749,6 +1925,12 @@
+@@ -1751,6 +1927,12 @@
  	case CX23885_BOARD_MPX885:
  	case CX23885_BOARD_MYGICA_X8507:
  	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
@@ -4717,8 +4693,8 @@ 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->i2c_bus[2].i2c_adap,
 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/cx23885-core.c	2013-05-03 17:36:31.000000000 +0800
+--- a/drivers/media/pci/cx23885/cx23885-core.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cx23885-core.c	2013-12-18 20:02:07.086844853 +0800
 @@ -1909,6 +1909,10 @@
  			(pci_status & PCI_MSK_GPIO0))
  		handled += altera_ci_irq(dev);
@@ -4730,7 +4706,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885
  	if (ts1_status) {
  		if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
  			handled += cx23885_irq_ts(ts1, ts1_status);
-@@ -2144,6 +2148,8 @@
+@@ -2141,6 +2145,8 @@
  		cx23885_irq_add_enable(dev, PCI_MSK_GPIO1 | PCI_MSK_GPIO0);
  		break;
  	case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
@@ -4740,8 +4716,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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/cx23885-dvb.c	2013-05-03 17:38:34.000000000 +0800
+--- a/drivers/media/pci/cx23885/cx23885-dvb.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cx23885-dvb.c	2013-12-18 20:02:12.338844794 +0800
 @@ -51,6 +51,8 @@
  #include "stv6110.h"
  #include "lnbh24.h"
@@ -4751,49 +4727,15 @@ 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"
-@@ -64,8 +66,8 @@
- #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"
- #include "tda10071.h"
- #include "a8293.h"
-@@ -500,42 +502,130 @@
- 	.if_khz = 5380,
+@@ -502,6 +504,93 @@
+ 	.if_khz = 4000,
  };
  
--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 */
 +int bst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
- {
- 	struct cx23885_tsport *port = fe->dvb->priv;
- 	struct cx23885_dev *dev = port->dev;
++{
++	struct cx23885_tsport *port = fe->dvb->priv;
++	struct cx23885_dev *dev = port->dev;
 +	
 +	cx23885_gpio_enable(dev, GPIO_1, 1);
 +	cx23885_gpio_enable(dev, GPIO_0, 1);
@@ -4814,13 +4756,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
 +	}
 +	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)
 +{
 +	struct cx23885_tsport *port = fe->dvb->priv;
@@ -4843,9 +4779,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
 +		cx23885_gpio_clear(dev, GPIO_12);
 +		break;
 +	}
- 	return 0;
- }
- 
++	return 0;
++}
++
 +/* bestunar single dvb-s2 */
 +static struct m88ds3103_config bst_ds3103_config = {
 +	.demod_address = 0x68,
@@ -4882,59 +4818,20 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
 +	.ts_mode = 3,	
 +};
 +
-+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)
-+{
-+	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;
-+}
-+
- static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)
- {
- 	struct dtv_frontend_properties *p = &fe->dtv_property_cache;
-@@ -1250,23 +1340,79 @@
- 					&tevii_ds3000_config,
- 					&i2c_bus->i2c_adap);
+ static struct stv090x_config prof_8000_stv090x_config = {
+ 	.device                 = STV0903,
+ 	.demod_mode             = STV090x_SINGLE,
+@@ -1287,6 +1376,57 @@
+ 				&tevii_ts2020_config, &i2c_bus->i2c_adap);
+ 		}
  		break;
--	case CX23885_BOARD_PROF_8000:
--		i2c_bus = &dev->i2c_bus[0];
 +	case CX23885_BOARD_BST_PS8512:
 +	case CX23885_BOARD_DVBSKY_S950:
 +		i2c_bus = &dev->i2c_bus[1];	
 +		fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
 +					&bst_ds3103_config,
 +					&i2c_bus->i2c_adap);
-+		break;	
-+			
++		break;				
 +	case CX23885_BOARD_DVBSKY_S952:
 +		switch (port->nr) {
 +		/* port B */
@@ -4953,32 +4850,18 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
 +			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:
 +		i2c_bus = &dev->i2c_bus[1];	
 +		fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
 +					&dvbsky_ds3103_ci_config,
 +					&i2c_bus->i2c_adap);
-+		break;
-+				
++		break;				
 +	case CX23885_BOARD_DVBSKY_C2800E_CI:
 +		i2c_bus = &dev->i2c_bus[1];	
 +		fe0->dvb.frontend = dvb_attach(m88dc2800_attach,
 +					&dvbsky_dc2800_config,
 +					&i2c_bus->i2c_adap);
 +		break;
- 
--			fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
 +	case CX23885_BOARD_DVBSKY_T9580:
 +		switch (port->nr) {
 +		/* port B */
@@ -4991,30 +4874,12 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
 +		/* port C */
 +		case 2:
 +			break;
- 		}
- 		break;
-+				
-+	case CX23885_BOARD_PROF_8000:
-+		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;
 +		}
-+		break;
- 	case CX23885_BOARD_HAUPPAUGE_HVR4400:
++		break;				
+ 	case CX23885_BOARD_PROF_8000:
  		i2c_bus = &dev->i2c_bus[0];
- 		fe0->dvb.frontend = dvb_attach(tda10071_attach,
-@@ -1325,7 +1471,7 @@
+ 
+@@ -1362,7 +1502,7 @@
  		printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n",
  			port->nr, port->frontends.adapter.proposed_mac);
  
@@ -5023,7 +4888,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: {
-@@ -1352,6 +1498,41 @@
+@@ -1389,6 +1529,41 @@
  		memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
  		break;
  		}
@@ -5065,7 +4930,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
  	}
  
  	return ret;
-@@ -1434,6 +1615,8 @@
+@@ -1471,6 +1646,8 @@
  
  	switch (port->dev->board) {
  	case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@@ -5075,8 +4940,8 @@ 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/cx23885.h	2013-05-03 17:14:20.000000000 +0800
+--- a/drivers/media/pci/cx23885/cx23885.h	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cx23885.h	2013-12-18 20:01:57.070844966 +0800
 @@ -94,6 +94,14 @@
  #define CX23885_BOARD_HAUPPAUGE_HVR4400        38
  #define CX23885_BOARD_AVERMEDIA_HC81R          39
@@ -5102,8 +4967,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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/cx23885-input.c	2013-05-03 17:42:09.000000000 +0800
+--- a/drivers/media/pci/cx23885/cx23885-input.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/cx23885-input.c	2013-12-18 20:02:22.262844683 +0800
 @@ -89,6 +89,12 @@
  	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
  	case CX23885_BOARD_TEVII_S470:
@@ -5150,8 +5015,8 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
  		/* 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/Kconfig	2013-05-03 17:43:05.000000000 +0800
+--- a/drivers/media/pci/cx23885/Kconfig	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx23885/Kconfig	2013-12-18 20:02:27.162844628 +0800
 @@ -23,6 +23,8 @@
  	select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
  	select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
@@ -5162,9 +5027,9 @@ diff -urN a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfi
  	select DVB_DS3000 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-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 @@
+--- a/drivers/media/pci/cx88/cx88-cards.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx88/cx88-cards.c	2013-12-18 20:01:17.934845406 +0800
+@@ -2314,6 +2314,18 @@
  		} },
  		.mpeg           = CX88_MPEG_DVB,
  	},
@@ -5183,7 +5048,7 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
  };
  
  /* ------------------------------------------------------------------ */
-@@ -2813,6 +2825,10 @@
+@@ -2818,6 +2830,10 @@
  		.subvendor = 0x1822,
  		.subdevice = 0x0023,
  		.card      = CX88_BOARD_TWINHAN_VP1027_DVBS,
@@ -5194,7 +5059,7 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
  	},
  };
  
-@@ -3547,6 +3563,12 @@
+@@ -3551,6 +3567,12 @@
  		cx_write(MO_SRST_IO, 1);
  		msleep(100);
  		break;
@@ -5208,8 +5073,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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx88/cx88-dvb.c	2013-05-03 17:09:09.000000000 +0800
+--- a/drivers/media/pci/cx88/cx88-dvb.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx88/cx88-dvb.c	2013-12-18 20:01:23.110845347 +0800
 @@ -54,6 +54,7 @@
  #include "stv0288.h"
  #include "stb6000.h"
@@ -5287,12 +5152,10 @@ 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,*/
-@@ -1477,6 +1533,35 @@
- 				&tevii_ts2020_config, &core->i2c_adap);
- 			fe0->dvb.frontend->ops.set_voltage =
+@@ -1487,6 +1543,35 @@
  							tevii_dvbs_set_voltage;
-+                }		
-+                break;
+ 		}
+ 		break;
 +	case CX88_BOARD_BST_PS8312:
 +		fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
 +						&dvbsky_ds3103_config,
@@ -5320,13 +5183,15 @@ 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-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 @@
+--- a/drivers/media/pci/cx88/cx88.h	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx88/cx88.h	2013-12-18 20:01:11.974845473 +0800
+@@ -237,6 +237,7 @@
  #define CX88_BOARD_WINFAST_DTV1800H_XC4000 88
  #define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89
  #define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43 90
@@ -5335,8 +5200,8 @@ 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx88/cx88-input.c	2013-01-26 14:52:03.000000000 +0800
+--- a/drivers/media/pci/cx88/cx88-input.c	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx88/cx88-input.c	2013-12-18 20:01:28.158845291 +0800
 @@ -419,6 +419,10 @@
  		rc_type          = RC_BIT_NEC;
  		ir->sampling     = 0xff00; /* address */
@@ -5349,8 +5214,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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx88/Kconfig	2013-05-03 17:10:41.000000000 +0800
+--- a/drivers/media/pci/cx88/Kconfig	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/pci/cx88/Kconfig	2013-12-18 20:01:33.034845236 +0800
 @@ -57,6 +57,7 @@
  	select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
  	select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
@@ -5360,9 +5225,9 @@ 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-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 @@
+--- a/drivers/media/rc/keymaps/Makefile	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/rc/keymaps/Makefile	2013-12-18 20:02:46.202844414 +0800
+@@ -28,6 +28,7 @@
  			rc-dm1105-nec.o \
  			rc-dntv-live-dvb-t.o \
  			rc-dntv-live-dvbt-pro.o \
@@ -5372,7 +5237,7 @@ diff -urN a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefil
  			rc-encore-enltv.o \
 diff -urN 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
-+++ b/drivers/media/rc/keymaps/rc-dvbsky.c	2013-01-26 14:52:49.000000000 +0800
++++ b/drivers/media/rc/keymaps/rc-dvbsky.c	2013-12-18 20:02:49.870844372 +0800
 @@ -0,0 +1,78 @@
 +/* rc-dvbsky.c - Keytable for Dvbsky Remote Controllers
 + *
@@ -5454,8 +5319,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-05-03 17:47:38.000000000 +0800
-@@ -0,0 +1,665 @@
++++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c	2013-12-18 20:03:15.374844086 +0800
+@@ -0,0 +1,741 @@
 +/*
 + * Driver for DVBSky USB2.0 receiver
 + *
@@ -5969,6 +5834,18 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
 +	return dvbsky_gpio_ctrl(d, 0x80, value);
 +}
 +
++static int dvbsky_usb_ci_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++{
++	struct dvb_usb_device *d = fe_to_d(fe);
++	u8 value;
++
++	if (voltage == SEC_VOLTAGE_OFF)
++		value = 0;
++	else
++		value = 1;
++	return dvbsky_gpio_ctrl(d, 0x00, value);
++}
++
 +static int dvbsky_read_mac_addr(struct dvb_usb_adapter *adap, u8 mac[6])
 +{
 +	struct dvb_usb_device *d = adap_to_d(adap);
@@ -6034,6 +5911,43 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
 +	return ret;
 +}
 +
++static struct m88ds3103_config dvbsky_usb_ds3103_ci_config = {
++	.demod_address = 0x68,
++	.ci_mode = 2,
++	.pin_ctrl = 0x82,
++	.ts_mode = 0,
++	.start_ctrl = dvbsky_sync_ctrl,
++	.set_voltage = dvbsky_usb_ci_set_voltage,
++};
++
++static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap)
++{
++	struct dvbsky_state *state = adap_to_priv(adap);
++	struct dvb_usb_device *d = adap_to_d(adap);
++	int ret = 0;
++	
++	dprintk("%s, build on %s %s()\n", __func__, __DATE__,__TIME__);
++	
++	dvbsky_gpio_ctrl(d, 0x04, 1);
++	
++	dvbsky_gpio_ctrl(d, 0x83, 0);
++	msleep(50);
++	dvbsky_gpio_ctrl(d, 0x83, 1);
++	msleep(20);
++	
++	adap->fe[0] = dvb_attach(m88ds3103_attach,
++				&dvbsky_usb_ds3103_ci_config,
++				&d->i2c_adap);
++	if (!adap->fe[0]) {
++		printk(KERN_ERR "dvbsky_s960c_attach fail.");
++		ret = -ENODEV;
++	}
++	
++	state->has_ci = 1;
++
++	return ret;
++}
++
 +static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name)
 +{
 +	return WARM;
@@ -6071,6 +5985,31 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
 +}
 +
 +/* DVB USB Driver stuff */
++static struct dvb_usb_device_properties dvbsky_s960c_props = {
++	.driver_name = KBUILD_MODNAME,
++	.owner = THIS_MODULE,
++	.adapter_nr = adapter_nr,
++	.size_of_priv = sizeof(struct dvbsky_state),
++
++	.generic_bulk_ctrl_endpoint = 0x01,
++	.generic_bulk_ctrl_endpoint_response = 0x81,
++
++	.i2c_algo         = &dvbsky_i2c_algo,
++	.frontend_attach  = dvbsky_s960c_attach,
++	.init             = dvbsky_init,
++	.get_rc_config    = dvbsky_get_rc_config,
++	.streaming_ctrl   = dvbsky_streaming_ctrl,
++	.identify_state	  = dvbsky_identify_state,
++	.exit             = dvbsky_exit,
++
++	.num_adapters = 1,
++	.adapter = {
++		{
++			.stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),
++		}
++	}
++};
++
 +static struct dvb_usb_device_properties dvbsky_s960_props = {
 +	.driver_name = KBUILD_MODNAME,
 +	.owner = THIS_MODULE,
@@ -6098,6 +6037,8 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2
 +};
 +
 +static const struct usb_device_id dvbsky_id_table[] = {
++	{ DVB_USB_DEVICE(0x0572, 0x960c,
++		&dvbsky_s960c_props, "DVBSky S960CI", RC_MAP_DVBSKY) },
 +	{ DVB_USB_DEVICE(0x0572, 0x6831,
 +		&dvbsky_s960_props, "DVBSky S960/S860", RC_MAP_DVBSKY) },
 +	{ }
@@ -6122,36 +6063,35 @@ 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-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 @@
+--- a/drivers/media/usb/dvb-usb-v2/Kconfig	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/usb/dvb-usb-v2/Kconfig	2013-12-18 20:03:20.618844027 +0800
+@@ -147,3 +147,9 @@
  	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
++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-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 @@
+--- a/drivers/media/usb/dvb-usb-v2/Makefile	2013-12-12 14:38:07.000000000 +0800
++++ b/drivers/media/usb/dvb-usb-v2/Makefile	2013-12-18 20:03:26.218843964 +0800
+@@ -40,6 +40,9 @@
  dvb-usb-rtl28xxu-objs := rtl28xxu.o
  obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
  
-+dvb-usb-dvbsky-objs := dvbsky.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-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 @@
+--- a/include/media/rc-map.h	2013-12-12 14:38:07.000000000 +0800
++++ b/include/media/rc-map.h	2013-12-18 19:59:03.122846921 +0800
+@@ -119,6 +119,7 @@
  #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_DVB_T           "rc-dntv-live-dvb-t"
diff --git a/packages/linux/patches/3.12.5/linux-210.01-dvbsky-auto-off.patch b/packages/linux/patches/3.12.5/linux-210.01-dvbsky-auto-off.patch
deleted file mode 100644
index 381e8b9bc9..0000000000
--- a/packages/linux/patches/3.12.5/linux-210.01-dvbsky-auto-off.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
-index 315809d..54dff7c 100644
---- a/drivers/media/dvb-frontends/m88ds3103.c
-+++ b/drivers/media/dvb-frontends/m88ds3103.c
-@@ -1244,6 +1244,8 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
- 	dprintk("symbol rate = %d\n", c->symbol_rate);
- 	dprintk("delivery system = %d\n", c->delivery_system);
- 	
-+	state->delivery_system = c->delivery_system;
-+	
- 	realFreq = c->frequency;
- 	lpf_offset_KHz = 0;
- 	if(c->symbol_rate < 5000000){
-@@ -1501,7 +1503,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
-                 }
- 		msleep(20);
- 	}
--	
-+/*	
- 	if((status & FE_HAS_LOCK) == 0){
- 		state->delivery_system = (state->delivery_system == SYS_DVBS) ? SYS_DVBS2 : SYS_DVBS;
- 		m88ds3103_demod_connect(fe, offset_khz);
-@@ -1514,7 +1516,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
- 			msleep(20);
- 		}
- 	}
--	
-+*/	
- 	if (status & FE_HAS_LOCK){
- 		if(state->config->ci_mode == 2)
- 			m88ds3103_set_clock_ratio(state);