v4l/dvb fixes from Michael Krufky

diff --git a/queue-2.6.17/dvb-fix-budget-av-frontend-detection.patch b/queue-2.6.17/dvb-fix-budget-av-frontend-detection.patch
new file mode 100644 (file)
index 0000000..50d0190
--- /dev/null
+++ b/queue-2.6.17/dvb-fix-budget-av-frontend-detection.patch
@@ -0,0 +1,37 @@
+From stable-bounces@linux.kernel.org  Fri Jun 30 12:52:53 2006
+Date: Fri, 30 Jun 2006 15:52:04 -0400
+From: Michael Krufky <mkrufky@linuxtv.org>
+To: stable@kernel.org
+Cc: v4l-dvb maintainer list <v4l-dvb-maintainer@linuxtv.org>,         Andrew de Quincey <adq_dvb@lidskialf.net>
+Subject: v4l/dvb: Fix budget-av frontend detection
+
+From: Andrew de Quincey <adq_dvb@lidskialf.net>
+
+The budget-av needs this GPIO set low for most cards to work.
+
+Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/media/dvb/ttpci/budget-av.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- linux-2.6.17.3.orig/drivers/media/dvb/ttpci/budget-av.c
++++ linux-2.6.17.3/drivers/media/dvb/ttpci/budget-av.c
+@@ -1017,12 +1017,13 @@ static void frontend_init(struct budget_
+       struct saa7146_dev * saa = budget_av->budget.dev;
+       struct dvb_frontend * fe = NULL;
+ 
++      /* Enable / PowerON Frontend */
++      saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
++
+       switch (saa->pci->subsystem_device) {
+               case SUBID_DVBS_KNC1_PLUS:
+               case SUBID_DVBC_KNC1_PLUS:
+               case SUBID_DVBT_KNC1_PLUS:
+-                      // Enable / PowerON Frontend
+-                      saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
+                       saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTHI);
+                       break;
+       }

diff --git a/queue-2.6.17/dvb-fix-ci-interface-on-pro-knc1-cards.patch b/queue-2.6.17/dvb-fix-ci-interface-on-pro-knc1-cards.patch
new file mode 100644 (file)
index 0000000..757d589
--- /dev/null
+++ b/queue-2.6.17/dvb-fix-ci-interface-on-pro-knc1-cards.patch
@@ -0,0 +1,35 @@
+From stable-bounces@linux.kernel.org  Fri Jun 30 12:52:53 2006
+Date: Fri, 30 Jun 2006 15:52:07 -0400
+From: Michael Krufky <mkrufky@linuxtv.org>
+To: stable@kernel.org
+Cc: v4l-dvb maintainer list <v4l-dvb-maintainer@linuxtv.org>,         Andrew de Quincey <adq_dvb@lidskialf.net>
+Subject: v4l/dvb: Fix CI interface on PRO KNC1 cards
+
+From: Andrew de Quincey <adq_dvb@lidskialf.net>
+
+The original driver had a restriction that if a card as an saa7113 chip,
+then it cannot have a CI interface. This is not the case.
+
+Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/media/dvb/ttpci/budget-av.c |    6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+--- linux-2.6.17.3.orig/drivers/media/dvb/ttpci/budget-av.c
++++ linux-2.6.17.3/drivers/media/dvb/ttpci/budget-av.c
+@@ -1218,11 +1218,7 @@ static int budget_av_attach(struct saa71
+ 
+       budget_av->budget.dvb_adapter.priv = budget_av;
+       frontend_init(budget_av);
+-
+-      if (!budget_av->has_saa7113) {
+-              ciintf_init(budget_av);
+-      }
+-
++      ciintf_init(budget_av);
+       return 0;
+ }
+ 

diff --git a/queue-2.6.17/dvb-fix-ci-on-old-knc1-dvbc-cards.patch b/queue-2.6.17/dvb-fix-ci-on-old-knc1-dvbc-cards.patch
new file mode 100644 (file)
index 0000000..3db0518
--- /dev/null
+++ b/queue-2.6.17/dvb-fix-ci-on-old-knc1-dvbc-cards.patch
@@ -0,0 +1,38 @@
+From stable-bounces@linux.kernel.org  Fri Jun 30 12:52:54 2006
+Date: Fri, 30 Jun 2006 15:52:06 -0400
+From: Michael Krufky <mkrufky@linuxtv.org>
+To: stable@kernel.org
+Cc: v4l-dvb maintainer list <v4l-dvb-maintainer@linuxtv.org>,         Andrew de Quincey <adq_dvb@lidskialf.net>
+Subject: v4l/dvb: Fix CI on old KNC1 DVBC cards
+
+From: Andrew de Quincey <adq_dvb@lidskialf.net>
+
+These cards do not need the tda10021 configuration change when data is
+streamed through a CAM module. This disables it for these ones.
+
+Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/media/dvb/ttpci/budget-av.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- linux-2.6.17.3.orig/drivers/media/dvb/ttpci/budget-av.c
++++ linux-2.6.17.3/drivers/media/dvb/ttpci/budget-av.c
+@@ -1060,6 +1060,15 @@ static void frontend_init(struct budget_
+               break;
+ 
+       case SUBID_DVBC_KNC1:
++              budget_av->reinitialise_demod = 1;
++              fe = tda10021_attach(&philips_cu1216_config,
++                                   &budget_av->budget.i2c_adap,
++                                   read_pwm(budget_av));
++              if (fe) {
++                      fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
++              }
++              break;
++
+       case SUBID_DVBC_KNC1_PLUS:
+               fe = tda10021_attach(&philips_cu1216_config,
+                                    &budget_av->budget.i2c_adap,

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
index 8631330ba9044d3b9fbec652066a830d15e22860..b79e3473f90fcbd6109ea1c39aa3c428291e3382 100644 (file)
--- a/queue-2.6.17/series
+++ b/queue-2.6.17/series
@@ -3,3 +3,6 @@ ib-mthca-restore-missing-pci-registers-after-reset.patch
 x86_64-fix-modular-pc-speaker.patch
 block-fix-bounce-limit-address-check.patch
 memory-hotplug-solve-config-broken-undefined-reference-to-online_page.patch
+dvb-fix-budget-av-frontend-detection.patch
+dvb-fix-ci-on-old-knc1-dvbc-cards.patch
+dvb-fix-ci-interface-on-pro-knc1-cards.patch