[PATCH] v4l: SAA7134 Update

- Corrected all cards marked as 7135 cards to 7133.
- Add new card support for Compro VideoMate TV Gold+II.
- Add new card support for Kworld Xpert TV PVR7134
- Add new card support for Typhoon DVB-T Cardbus.
- Changes to comply with CodingStyle: // comments converted to /* */
- Remove irq2_mask field from saa7134_dev structure.
- Collect all the bits needed in saa7134_hwinit2() instead.
- Distinguish the different variants of the Medion MD7134 modules via eeprom
- moved Philips FMD1216 radio specific setup to saa7134-core.c
- Fix kernel compile error with CONFIG_MODULES=n
- Cleanup tuner private calls.
- Some Indent fixes.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Hannibal <hannibal@megapolis.pl>
Signed-off-by: Elshin Roman <roxmail@list.ru>
Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de>
Signed-off-by: Juergen Orschiedt <jorschiedt@web.de>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 81732904623f..b5bede95dbf5 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-oss.c,v 1.14 2005/05/18 22:45:16 hhackmann Exp $
+ * $Id: saa7134-oss.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * oss dsp interface
@@ -556,21 +556,28 @@ mixer_recsrc_7134(struct saa7134_dev *dev)
 static int
 mixer_recsrc_7133(struct saa7134_dev *dev)
 {
-        u32 value = 0xbbbbbb;
+        u32 anabar, xbarin;
 
+        xbarin = 0x03; // adc
+    anabar = 0;
         switch (dev->oss.input) {
         case TV:
-                value = 0xbbbb10;  /* MAIN */
+                xbarin = 0; // Demodulator
+        anabar = 2; // DACs
                 break;
         case LINE1:
-                value = 0xbbbb32;  /* AUX1 */
+                anabar = 0;  // aux1, aux1
                 break;
         case LINE2:
         case LINE2_LEFT:
-                value = 0xbbbb54;  /* AUX2 */
+                anabar = 9;  // aux2, aux2
                 break;
         }
-        saa_dsp_writel(dev, 0x46c >> 2, value);
+    /* output xbar always main channel */
+        saa_dsp_writel(dev, 0x46c >> 2, 0xbbbb10);
+        saa_dsp_writel(dev, 0x464 >> 2, xbarin);
+        saa_writel(0x594 >> 2, anabar);
+
         return 0;
 }