From: Chris Wright Date: Thu, 6 Jul 2006 20:36:38 +0000 (-0700) Subject: The remaining 5 v4l/dvb fixes, fwd from Michael Krufky X-Git-Tag: v2.6.17.7~15^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51e901cd77c637ff963063a8cb4be5c3d3747751;p=thirdparty%2Fkernel%2Fstable-queue.git The remaining 5 v4l/dvb fixes, fwd from Michael Krufky --- diff --git a/queue-2.6.17/dvb-bt8xx-fix-frontend-detection-for-dvico-fusionhdtv-dvb-t-lite-rev-1.2.patch b/queue-2.6.17/dvb-bt8xx-fix-frontend-detection-for-dvico-fusionhdtv-dvb-t-lite-rev-1.2.patch new file mode 100644 index 00000000000..122e6c12afd --- /dev/null +++ b/queue-2.6.17/dvb-bt8xx-fix-frontend-detection-for-dvico-fusionhdtv-dvb-t-lite-rev-1.2.patch @@ -0,0 +1,62 @@ +From stable-bounces@linux.kernel.org Thu Jul 6 13:00:36 2006 +Date: Thu, 06 Jul 2006 14:26:45 -0400 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list +Subject: dvb-bt8xx: fix frontend detection for DViCO FusionHDTV DVB-T Lite rev 1.2 + +From: Michael Krufky + +This patch adds support for the new revision of the DViCO +FusionHDTV DVB-T Lite, based on the zl10353 demod instead +of mt352. + +Both mt352 and zl10353 revisions of this card have the +same PCI subsystem ID. + +Signed-off-by: Michael Krufky +Acked-by: Chris Pascoe +Acked-by: Manu Abraham +Signed-off-by: Chris Wright +--- + + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 10 ++++++++++ + drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 + + 2 files changed, 11 insertions(+) + +--- linux-2.6.17.3.orig/drivers/media/dvb/bt8xx/dvb-bt8xx.c ++++ linux-2.6.17.3/drivers/media/dvb/bt8xx/dvb-bt8xx.c +@@ -184,6 +184,11 @@ static struct mt352_config thomson_dtt75 + .pll_set = thomson_dtt7579_pll_set, + }; + ++static struct zl10353_config thomson_dtt7579_zl10353_config = { ++ .demod_address = 0x0f, ++ .pll_set = thomson_dtt7579_pll_set, ++}; ++ + static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) + { + u32 freq = params->frequency; +@@ -617,6 +622,11 @@ static void frontend_init(struct dvb_bt8 + switch(type) { + case BTTV_BOARD_DVICO_DVBT_LITE: + card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter); ++ ++ if (card->fe == NULL) ++ card->fe = zl10353_attach(&thomson_dtt7579_zl10353_config, ++ card->i2c_adapter); ++ + if (card->fe != NULL) { + card->fe->ops->info.frequency_min = 174000000; + card->fe->ops->info.frequency_max = 862000000; +--- linux-2.6.17.3.orig/drivers/media/dvb/bt8xx/dvb-bt8xx.h ++++ linux-2.6.17.3/drivers/media/dvb/bt8xx/dvb-bt8xx.h +@@ -37,6 +37,7 @@ + #include "cx24110.h" + #include "or51211.h" + #include "lgdt330x.h" ++#include "zl10353.h" + + struct dvb_bt8xx_card { + struct mutex lock; diff --git a/queue-2.6.17/series b/queue-2.6.17/series index 9cd4b1acf3e..69ef72bf07f 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -14,3 +14,8 @@ kconfig-fix-description-and-dependencies-for-saa7115-module.patch pkt_sched-fix-illegal-memory-dereferences-when-dumping-actions.patch pkt_sched-return-enoent-if-action-module-is-unavailable.patch pkt_sched-fix-error-handling-while-dumping-actions.patch +v4l-dvb-backport-fix-to-artec-usb-dvb-devices.patch +v4l-dvb-backport-the-diseqc-regression-fix-to-2.6.17.x.patch +v4l-dvb-backport-the-budget-driver-diseqc-instability-fix.patch +v4l-dvb-stradis-dont-export-module_device_table.patch +dvb-bt8xx-fix-frontend-detection-for-dvico-fusionhdtv-dvb-t-lite-rev-1.2.patch diff --git a/queue-2.6.17/v4l-dvb-backport-fix-to-artec-usb-dvb-devices.patch b/queue-2.6.17/v4l-dvb-backport-fix-to-artec-usb-dvb-devices.patch new file mode 100644 index 00000000000..db92c318f2e --- /dev/null +++ b/queue-2.6.17/v4l-dvb-backport-fix-to-artec-usb-dvb-devices.patch @@ -0,0 +1,38 @@ +From stable-bounces@linux.kernel.org Thu Jul 6 13:00:31 2006 +Date: Thu, 06 Jul 2006 14:26:32 -0400 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list , Andrew de Quincey +Subject: v4l/dvb: Backport fix to artec USB DVB devices + +From: Andrew de Quincey + +Backport fix to artec USB DVB devices + +Signed-off-by: Andrew de Quincey +Signed-off-by: Michael Krufky +Signed-off-by: Chris Wright +--- + + drivers/media/dvb/frontends/dvb-pll.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- linux-2.6.17.3.orig/drivers/media/dvb/frontends/dvb-pll.c ++++ linux-2.6.17.3/drivers/media/dvb/frontends/dvb-pll.c +@@ -194,11 +194,11 @@ struct dvb_pll_desc dvb_pll_tda665x = { + { 253834000, 36249333, 166667, 0xca, 0x62 /* 011 0 0 0 10 */ }, + { 383834000, 36249333, 166667, 0xca, 0xa2 /* 101 0 0 0 10 */ }, + { 443834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0 10 */ }, +- { 444000000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0 11 */ }, +- { 583834000, 36249333, 166667, 0xca, 0x63 /* 011 0 0 0 11 */ }, +- { 793834000, 36249333, 166667, 0xca, 0xa3 /* 101 0 0 0 11 */ }, +- { 444834000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0 11 */ }, +- { 861000000, 36249333, 166667, 0xca, 0xe3 /* 111 0 0 0 11 */ }, ++ { 444000000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1 00 */ }, ++ { 583834000, 36249333, 166667, 0xca, 0x64 /* 011 0 0 1 00 */ }, ++ { 793834000, 36249333, 166667, 0xca, 0xa4 /* 101 0 0 1 00 */ }, ++ { 444834000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1 00 */ }, ++ { 861000000, 36249333, 166667, 0xca, 0xe4 /* 111 0 0 1 00 */ }, + } + }; + EXPORT_SYMBOL(dvb_pll_tda665x); diff --git a/queue-2.6.17/v4l-dvb-backport-the-budget-driver-diseqc-instability-fix.patch b/queue-2.6.17/v4l-dvb-backport-the-budget-driver-diseqc-instability-fix.patch new file mode 100644 index 00000000000..8cb3caeb276 --- /dev/null +++ b/queue-2.6.17/v4l-dvb-backport-the-budget-driver-diseqc-instability-fix.patch @@ -0,0 +1,35 @@ +From stable-bounces@linux.kernel.org Thu Jul 6 13:00:52 2006 +Date: Thu, 06 Jul 2006 14:26:40 -0400 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list , Oliver Endriss , Andrew de Quincey +Subject: v4l/dvb: Backport the budget driver DISEQC instability fix + +From: Oliver Endriss + +Backport the budget driver DISEQC instability fix. + +Signed-off-by: Oliver Endriss +Signed-off-by: Andrew de Quincey +Signed-off-by: Michael Krufky +Signed-off-by: Chris Wright +--- + + drivers/media/dvb/ttpci/budget.c | 6 ------ + 1 file changed, 6 deletions(-) + +--- linux-2.6.17.3.orig/drivers/media/dvb/ttpci/budget.c ++++ linux-2.6.17.3/drivers/media/dvb/ttpci/budget.c +@@ -367,12 +367,6 @@ static void frontend_init(struct budget + + // try the ALPS BSRU6 now + budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap); +- if (budget->dvb_frontend) { +- budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd; +- budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst; +- budget->dvb_frontend->ops->set_tone = budget_set_tone; +- break; +- } + break; + + case 0x1004: // Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659)) diff --git a/queue-2.6.17/v4l-dvb-backport-the-diseqc-regression-fix-to-2.6.17.x.patch b/queue-2.6.17/v4l-dvb-backport-the-diseqc-regression-fix-to-2.6.17.x.patch new file mode 100644 index 00000000000..3c6a49f146c --- /dev/null +++ b/queue-2.6.17/v4l-dvb-backport-the-diseqc-regression-fix-to-2.6.17.x.patch @@ -0,0 +1,55 @@ +From stable-bounces@linux.kernel.org Thu Jul 6 13:00:42 2006 +Date: Thu, 06 Jul 2006 14:26:36 -0400 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list , Andrew de Quincey +Subject: v4l/dvb: Backport the DISEQC regression fix to 2.6.17.x + +From: Andrew de Quincey + +Backport the DISEQC regression fix to 2.6.17.x + +Signed-off-by: Andrew de Quincey +Signed-off-by: Michael Krufky +Signed-off-by: Chris Wright +--- + + drivers/media/dvb/dvb-core/dvb_frontend.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +--- linux-2.6.17.3.orig/drivers/media/dvb/dvb-core/dvb_frontend.c ++++ linux-2.6.17.3/drivers/media/dvb/dvb-core/dvb_frontend.c +@@ -519,7 +519,9 @@ static int dvb_frontend_thread(void *dat + fepriv->delay = 3*HZ; + fepriv->status = 0; + fepriv->wakeup = 0; +- fepriv->reinitialise = 1; ++ fepriv->reinitialise = 0; ++ ++ dvb_frontend_init(fe); + + while (1) { + up(&fepriv->sem); /* is locked when we enter the thread... */ +@@ -996,17 +998,17 @@ static int dvb_frontend_open(struct inod + return ret; + + if ((file->f_flags & O_ACCMODE) != O_RDONLY) { ++ /* normal tune mode when opened R/W */ ++ fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT; ++ fepriv->tone = -1; ++ fepriv->voltage = -1; ++ + ret = dvb_frontend_start (fe); + if (ret) + dvb_generic_release (inode, file); + + /* empty event queue */ + fepriv->events.eventr = fepriv->events.eventw = 0; +- +- /* normal tune mode when opened R/W */ +- fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT; +- fepriv->tone = -1; +- fepriv->voltage = -1; + } + + return ret; diff --git a/queue-2.6.17/v4l-dvb-stradis-dont-export-module_device_table.patch b/queue-2.6.17/v4l-dvb-stradis-dont-export-module_device_table.patch new file mode 100644 index 00000000000..b99456c6916 --- /dev/null +++ b/queue-2.6.17/v4l-dvb-stradis-dont-export-module_device_table.patch @@ -0,0 +1,33 @@ +From stable-bounces@linux.kernel.org Thu Jul 6 13:00:36 2006 +Date: Thu, 06 Jul 2006 14:26:44 -0400 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list , Andrew de Quincey +Subject: v4l/dvb: stradis: dont export MODULE_DEVICE_TABLE + +From: Andrew de Quincey + +This patch prevents the stradis driver from breaking all +other saa7146 devices by removing the autodetection based +on PCI subsystem ID 0000:0000 (no eeprom). Users that +want to use the stradis driver will have to manually +insert the module, or specify it in modprobe.conf + +Signed-off-by: Andrew de Quincey +Signed-off-by: Michael Krufky +Signed-off-by: Chris Wright +--- + + drivers/media/video/stradis.c | 1 - + 1 file changed, 1 deletion(-) + +--- linux-2.6.17.3.orig/drivers/media/video/stradis.c ++++ linux-2.6.17.3/drivers/media/video/stradis.c +@@ -2180,7 +2180,6 @@ static struct pci_device_id stradis_pci_ + { 0 } + }; + +-MODULE_DEVICE_TABLE(pci, stradis_pci_tbl); + + static struct pci_driver stradis_driver = { + .name = "stradis",