linux: update patches for 3.13-rc6

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/linux/patches/3.13-rc1/linux-210.01-dvbsky-auto-off.patch.bk

@@ -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);

packages/linux/patches/3.13-rc1/linux-992.03-i915_fix_clamping_to_limited_range.patch

@@ -1,34 +0,0 @@
-From f6234120ad06363236598d3a009c6117d66914a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-Date: Mon, 25 Nov 2013 16:19:30 +0200
-Subject: [PATCH] drm/i915: Fix pipe CSC post offset calculation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We were miscalculating the pipe CSC post offset for the full->limited
-range conversion. The resulting post offset was double what it was
-supposed to be, which caused blacks to come out grey when using
-limited range output on HSW+.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index e85d838..4fab496 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -5991,7 +5991,7 @@ static void intel_set_pipe_csc(struct drm_crtc *crtc)
- 		uint16_t postoff = 0;
- 
- 		if (intel_crtc->config.limited_color_range)
--			postoff = (16 * (1 << 13) / 255) & 0x1fff;
-+			postoff = (16 * (1 << 12) / 255) & 0x1fff;
- 
- 		I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), postoff);
- 		I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), postoff);
--- 
-1.8.3.2

packages/linux/patches/3.13-rc1/linux-999.91-nouveau-Fixed_the_hwmon_undeclared_build_error.patch

@@ -1,47 +0,0 @@
-From: Adrian Pop <sultryweather@xxxxxxxxx>
-Date: Fri, 22 Nov 2013 12:52:19 +0200
-Subject: [PATCH] nouveau: Fixed the 'hwmon' undeclared build error
-
-hwmon is declared inside the #if defined(CONFIG_HWMON)... but is still
-referenced outside of it, which results in a build error. By removing
-the reference, Linux builds successfully with both code paths.
-Two warnings from running checkpatch.pl have been fixed too.
-
-Signed-off-by: Adrian Pop <sultryweather@xxxxxxxxx>
----
- drivers/gpu/drm/nouveau/nouveau_hwmon.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
-index 38a4db5..21fc8d6 100644
---- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
-@@ -357,7 +357,7 @@ nouveau_hwmon_show_fan1_input(struct device *d, struct device_attribute *attr,
- static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, nouveau_hwmon_show_fan1_input,
- 			  NULL, 0);
- 
-- static ssize_t
-+static ssize_t
- nouveau_hwmon_get_pwm1_enable(struct device *d,
- 			   struct device_attribute *a, char *buf)
- {
-@@ -383,7 +383,7 @@ nouveau_hwmon_set_pwm1_enable(struct device *d, struct device_attribute *a,
- 	long value;
- 	int ret;
- 
--	if (strict_strtol(buf, 10, &value) == -EINVAL)
-+	if (kstrtol(buf, 10, &value) == -EINVAL)
- 		return -EINVAL;
- 
- 	ret = therm->attr_set(therm, NOUVEAU_THERM_ATTR_FAN_MODE, value);
-@@ -630,7 +630,6 @@ error:
- 	hwmon->hwmon = NULL;
- 	return ret;
- #else
--	hwmon->hwmon = NULL;
- 	return 0;
- #endif
- }
--- 
-1.8.4.2
-

packages/linux/patches/3.13-rc1/maybe_todo/linux-990.12-Radeon-SI-workaround.patch

@@ -1,46 +0,0 @@
-From 8c01e58073101756ce1aceadf0471fcb0db6a61c Mon Sep 17 00:00:00 2001
-From: fritsch <peter.fruehberger@gmail.com>
-Date: Fri, 25 Oct 2013 19:22:44 +0200
-Subject: [PATCH 2/5] Radeon SI workaround
-
----
- drivers/gpu/drm/radeon/ni.c | 23 ++++++++++++++++++++++-
- 1 file changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
-index cac2866..66441cf 100644
---- a/drivers/gpu/drm/radeon/ni.c
-+++ b/drivers/gpu/drm/radeon/ni.c
-@@ -933,7 +933,28 @@ static void cayman_gpu_init(struct radeon_device *rdev)
- 		rdev->config.cayman.sx_max_export_size = 256;
- 		rdev->config.cayman.sx_max_export_pos_size = 64;
- 		rdev->config.cayman.sx_max_export_smx_size = 192;
--		rdev->config.cayman.max_hw_contexts = 8;
-+		if ((rdev->pdev->device == 0x9900) ||
-+		    (rdev->pdev->device == 0x9901) ||
-+		    (rdev->pdev->device == 0x9903) ||
-+		    (rdev->pdev->device == 0x9904) ||
-+		    (rdev->pdev->device == 0x9905) ||
-+		    (rdev->pdev->device == 0x9906) ||
-+		    (rdev->pdev->device == 0x9907) ||
-+		    (rdev->pdev->device == 0x9908) ||
-+		    (rdev->pdev->device == 0x9909) ||
-+		    (rdev->pdev->device == 0x990A) ||
-+		    (rdev->pdev->device == 0x990B) ||
-+		    (rdev->pdev->device == 0x990C) ||
-+		    (rdev->pdev->device == 0x990D) ||
-+		    (rdev->pdev->device == 0x990E) ||
-+		    (rdev->pdev->device == 0x990F) ||
-+		    (rdev->pdev->device == 0x9910) ||
-+		    (rdev->pdev->device == 0x9913) ||
-+		    (rdev->pdev->device == 0x9917) ||
-+		    (rdev->pdev->device == 0x9918))
-+			rdev->config.cayman.max_hw_contexts = 8;
-+		else
-+			rdev->config.cayman.max_hw_contexts = 4;
- 		rdev->config.cayman.sq_num_cf_insts = 2;
- 
- 		rdev->config.cayman.sc_prim_fifo_size = 0x40;
--- 
-1.8.3.2
-

packages/linux/patches/3.13-rc6/broken/linux-210-dvbsky.patch

@@ -1,9 +1,9 @@
-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
-@@ -200,6 +200,20 @@
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/Kconfig linux-3.13-rc6.patch/drivers/media/dvb-frontends/Kconfig
+--- linux-3.13-rc6/drivers/media/dvb-frontends/Kconfig	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/Kconfig	2013-12-31 00:36:51.001678640 +0100
+@@ -207,6 +207,20 @@
  	help
- 	  A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
+ 	  A Dual DVB-S/S2 tuner module. Say Y when you want to support this frontend.
  
 +config DVB_M88DS3103
 +	tristate "Montage M88DS3103 based"
@@ -22,9 +22,9 @@ diff -urN a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kc
  config DVB_SI21XX
  	tristate "Silicon Labs SI21XX based"
  	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
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.c linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.c
+--- linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.c	2013-12-31 00:36:51.002678635 +0100
 @@ -0,0 +1,2124 @@
 +/*
 +    M88DC2800/M88TC2800  - DVB-C demodulator and tuner from Montage
@@ -2150,10 +2150,10 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontend
 +MODULE_AUTHOR("Max Nibble <nibble.max@gmail.com>");
 +MODULE_LICENSE("GPL");
 +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 @@
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.h linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.h
+--- linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.h	2013-12-31 00:36:51.002678635 +0100
+@@ -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
@@ -2197,10 +2198,10 @@ diff -urN a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontend
 +}
 +#endif /* CONFIG_DVB_M88DC2800 */
 +#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 @@
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.c
+--- linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.c	2013-12-31 00:36:51.003678631 +0100
+@@ -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);
@@ -3911,9 +3909,9 @@ 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_AUTHOR("Max nibble");
 +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
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.h linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.h
+--- linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.h	2013-12-31 00:36:51.003678631 +0100
 @@ -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);
@@ -3968,9 +3966,9 @@ diff -urN a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontend
 +}
 +#endif /* CONFIG_DVB_M88DS3103 */
 +#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
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103_priv.h linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103_priv.h
+--- linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103_priv.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103_priv.h	2013-12-31 00:36:51.003678631 +0100
 @@ -0,0 +1,403 @@
 +/*
 +    Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@@ -4375,20 +4373,20 @@ 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
-@@ -103,4 +103,5 @@
+diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/Makefile linux-3.13-rc6.patch/drivers/media/dvb-frontends/Makefile
+--- linux-3.13-rc6/drivers/media/dvb-frontends/Makefile	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/Makefile	2013-12-31 00:36:51.004678626 +0100
+@@ -104,4 +104,5 @@
  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 -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 @@
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.c
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.c	2013-12-31 00:36:51.004678626 +0100
+@@ -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);
  }
@@ -4429,9 +4427,9 @@ 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
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.h linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.h
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.h	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.h	2013-12-31 00:36:51.004678626 +0100
 @@ -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,
@@ -4443,10 +4441,10 @@ 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);
 +
  #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 @@
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-cards.c
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-cards.c	2013-12-31 00:36:51.004678626 +0100
+@@ -613,6 +613,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 @@
+@@ -874,6 +902,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 @@
+@@ -1483,9 +1535,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 @@
+@@ -1573,6 +1700,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 @@
+@@ -1602,6 +1746,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:
+@@ -1649,6 +1799,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 @@
+@@ -1752,6 +1908,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 @@
+@@ -1800,6 +1960,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 @@
+@@ -1857,6 +2033,12 @@
  	case CX23885_BOARD_MPX885:
  	case CX23885_BOARD_MYGICA_X8507:
  	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
@@ -4714,11 +4690,11 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx2388
 +	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,
-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
+ 	case CX23885_BOARD_TBS_6980:
+ 	case CX23885_BOARD_TBS_6981:
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-core.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-core.c
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-core.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-core.c	2013-12-31 00:36:51.005678622 +0100
 @@ -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:
@@ -4739,61 +4715,27 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885
  		cx23885_irq_add_enable(dev, PCI_MSK_GPIO0);
  		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
-@@ -51,6 +51,8 @@
- #include "stv6110.h"
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-dvb.c
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-dvb.c	2013-12-31 00:38:25.559251380 +0100
+@@ -52,6 +52,8 @@
  #include "lnbh24.h"
  #include "cx24116.h"
+ #include "cx24117.h"
 +#include "m88ds3103.h"
 +#include "m88dc2800.h"
  #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,
+@@ -507,6 +509,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,51 +4818,13 @@ 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,
+@@ -1311,6 +1400,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];	
@@ -4934,7 +4832,6 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
 +					&bst_ds3103_config,
 +					&i2c_bus->i2c_adap);
 +		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;				
-+				
 +	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:
+ 	case CX23885_BOARD_PROF_8000:
  		i2c_bus = &dev->i2c_bus[0];
- 		fe0->dvb.frontend = dvb_attach(tda10071_attach,
-@@ -1325,7 +1471,7 @@
+ 
+@@ -1386,7 +1526,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 @@
+@@ -1413,6 +1553,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 @@
+@@ -1495,6 +1670,8 @@
  
  	switch (port->dev->board) {
  	case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@@ -5074,12 +4939,12 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/
  		netup_ci_exit(port);
  		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
-@@ -94,6 +94,14 @@
- #define CX23885_BOARD_HAUPPAUGE_HVR4400        38
- #define CX23885_BOARD_AVERMEDIA_HC81R          39
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885.h linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885.h
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885.h	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885.h	2013-12-31 00:36:51.006678617 +0100
+@@ -97,6 +97,14 @@
+ #define CX23885_BOARD_TBS_6980                 41
+ #define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 42
  
 +#define CX23885_BOARD_BASE_INDEX	       40
 +#define CX23885_BOARD_BST_PS8512	       (CX23885_BOARD_BASE_INDEX)
@@ -5092,7 +4957,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23
  #define GPIO_0 0x00000001
  #define GPIO_1 0x00000002
  #define GPIO_2 0x00000004
-@@ -231,7 +239,7 @@
+@@ -234,7 +242,7 @@
  	 */
  	u32			clk_freq;
  	struct cx23885_input    input[MAX_CX23885_INPUT];
@@ -5101,9 +4966,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23
  	/* 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-04-29 08:36:01.000000000 +0800
-+++ b/drivers/media/pci/cx23885/cx23885-input.c	2013-05-03 17:42:09.000000000 +0800
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-input.c
+--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-input.c	2013-12-31 00:36:51.006678617 +0100
 @@ -89,6 +89,12 @@
  	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
  	case CX23885_BOARD_TEVII_S470:
@@ -5115,9 +4980,9 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
 +	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
-@@ -141,6 +147,12 @@
+ 	case CX23885_BOARD_TBS_6980:
+ 	case CX23885_BOARD_TBS_6981:
+@@ -143,6 +149,12 @@
  	case CX23885_BOARD_HAUPPAUGE_HVR1850:
  	case CX23885_BOARD_HAUPPAUGE_HVR1290:
  	case CX23885_BOARD_HAUPPAUGE_HVR1250:
@@ -5130,7 +4995,7 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
  	case CX23885_BOARD_MYGICA_X8507:
  		/*
  		 * The IR controller on this board only returns pulse widths.
-@@ -291,6 +303,18 @@
+@@ -295,6 +307,18 @@
  		/* A guess at the remote */
  		rc_map = RC_MAP_TEVII_NEC;
  		break;
@@ -5149,22 +5014,22 @@ diff -urN a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx2388
  	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-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
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/Kconfig linux-3.13-rc6.patch/drivers/media/pci/cx23885/Kconfig
+--- linux-3.13-rc6/drivers/media/pci/cx23885/Kconfig	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/Kconfig	2013-12-31 00:37:32.577490726 +0100
+@@ -24,6 +24,8 @@
  	select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
  	select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+ 	select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT
 +	select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
 +	select DVB_M88DC2800 if MEDIA_SUBDRV_AUTOSELECT
  	select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
  	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 @@
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-cards.c
+--- linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-cards.c	2013-12-31 00:36:51.007678613 +0100
+@@ -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;
@@ -5207,9 +5072,9 @@ diff -urN a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-ca
  	} /*end switch() */
  
  
-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
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-dvb.c
+--- linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-dvb.c	2013-12-31 00:36:51.007678613 +0100
 @@ -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:
-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 @@
+ 	case CX88_BOARD_TBS_8920:
+ 	case CX88_BOARD_PROF_7300:
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88.h linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88.h
+--- linux-3.13-rc6/drivers/media/pci/cx88/cx88.h	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88.h	2013-12-31 00:36:51.007678613 +0100
+@@ -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
@@ -5334,9 +5199,9 @@ 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
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-input.c linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-input.c
+--- linux-3.13-rc6/drivers/media/pci/cx88/cx88-input.c	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-input.c	2013-12-31 00:36:51.007678613 +0100
 @@ -419,6 +419,10 @@
  		rc_type          = RC_BIT_NEC;
  		ir->sampling     = 0xff00; /* address */
@@ -5348,9 +5213,9 @@ 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
+diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/Kconfig linux-3.13-rc6.patch/drivers/media/pci/cx88/Kconfig
+--- linux-3.13-rc6/drivers/media/pci/cx88/Kconfig	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/pci/cx88/Kconfig	2013-12-31 00:36:51.007678613 +0100
 @@ -57,6 +57,7 @@
  	select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
  	select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
@@ -5359,10 +5224,10 @@ diff -urN a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
  	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
  	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 @@
+diff -Naur linux-3.13-rc6/drivers/media/rc/keymaps/Makefile linux-3.13-rc6.patch/drivers/media/rc/keymaps/Makefile
+--- linux-3.13-rc6/drivers/media/rc/keymaps/Makefile	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/rc/keymaps/Makefile	2013-12-31 00:36:51.007678613 +0100
+@@ -28,6 +28,7 @@
  			rc-dm1105-nec.o \
  			rc-dntv-live-dvb-t.o \
  			rc-dntv-live-dvbt-pro.o \
@@ -5370,9 +5235,9 @@ diff -urN a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefil
  			rc-em-terratec.o \
  			rc-encore-enltv2.o \
  			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
+diff -Naur linux-3.13-rc6/drivers/media/rc/keymaps/rc-dvbsky.c linux-3.13-rc6.patch/drivers/media/rc/keymaps/rc-dvbsky.c
+--- linux-3.13-rc6/drivers/media/rc/keymaps/rc-dvbsky.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/rc/keymaps/rc-dvbsky.c	2013-12-31 00:36:51.007678613 +0100
 @@ -0,0 +1,78 @@
 +/* rc-dvbsky.c - Keytable for Dvbsky Remote Controllers
 + *
@@ -5452,10 +5317,10 @@ diff -urN a/drivers/media/rc/keymaps/rc-dvbsky.c b/drivers/media/rc/keymaps/rc-d
 +
 +MODULE_LICENSE("GPL");
 +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 @@
+diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/dvbsky.c
+--- linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/dvbsky.c	2013-12-31 00:36:51.008678608 +0100
+@@ -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) },
 +	{ }
@@ -6121,10 +6062,10 @@ 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_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 @@
+diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Kconfig linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Kconfig
+--- linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Kconfig	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Kconfig	2013-12-31 00:36:51.008678608 +0100
+@@ -147,3 +147,9 @@
  	help
  	  Say Y here to support the Realtek RTL28xxU DVB USB receiver.
  
@@ -6134,11 +6075,10 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/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 @@
+diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Makefile linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Makefile
+--- linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Makefile	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Makefile	2013-12-31 00:36:51.008678608 +0100
+@@ -40,6 +40,9 @@
  dvb-usb-rtl28xxu-objs := rtl28xxu.o
  obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
  
@@ -6148,10 +6088,10 @@ diff -urN a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2
  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 @@
+diff -Naur linux-3.13-rc6/include/media/rc-map.h linux-3.13-rc6.patch/include/media/rc-map.h
+--- linux-3.13-rc6/include/media/rc-map.h	2013-12-30 01:01:33.000000000 +0100
++++ linux-3.13-rc6.patch/include/media/rc-map.h	2013-12-31 00:36:51.023678540 +0100
+@@ -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"