Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / media / video / saa7134 / saa7134-oss.c

diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 8173290..b5bede9 100644 (file)
--- 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;
 }