Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2014-01-01 22:47:18 +01:00
commit 1a49ea796e
8 changed files with 27 additions and 37 deletions

View File

@ -1,30 +0,0 @@
From edab54fcfb1eb4b56868d2e364cf49dc3c6bad25 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 18 Sep 2013 14:52:05 +0300
Subject: [PATCH] A split for ds3000/ts2020 code forgot to change the TEVII_S471 code.
Change the TEVII_S471 according the changes to TEVII_S470.
BP: https://linuxtv.org/patch/19731/
---
drivers/media/pci/cx23885/cx23885-dvb.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 5db14f8..4cbf20a 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1339,6 +1339,11 @@ static int dvb_register(struct cx23885_tsport *port)
fe0->dvb.frontend = dvb_attach(ds3000_attach,
&tevii_ds3000_config,
&i2c_bus->i2c_adap);
+ if (fe0->dvb.frontend != NULL) {
+ dvb_attach(ts2020_attach, fe0->dvb.frontend,
+ &tevii_ts2020_config, &i2c_bus->i2c_adap);
+ fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
+ }
break;
case CX23885_BOARD_BST_PS8512:
case CX23885_BOARD_DVBSKY_S950:
--
1.7.2.5

View File

@ -2155,7 +2155,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m

View File

@ -1865,7 +1865,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m

View File

@ -2177,7 +2177,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m

View File

@ -2156,7 +2156,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m

View File

@ -1614,7 +1614,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m

View File

@ -2176,7 +2176,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m

View File

@ -2155,7 +2155,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# #
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000_DVB=m