[PATCH] v4l: CX88 cards update

This patch adds support for various CX88 cards and allows specifying
card addresses.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: cybercide@f2s.com <cybercide@f2s.com>
Signed-off-by: Catalin Climov <catalin@climov.com>
Signed-off-by: Nickolay V Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 63 insertions, 40 deletions

diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index f2a9475a2fee..46d78b1dc9b2 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-tvaudio.c,v 1.34 2005/03/07 16:10:51 kraxel Exp $
+    $Id: cx88-tvaudio.c,v 1.36 2005/06/05 05:53:45 mchehab Exp $
 
     cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver
 
@@ -127,7 +127,8 @@ static void set_audio_start(struct cx88_core *core,
         cx_write(AUD_VOL_CTL,       (1 << 6));
 
         //  increase level of input by 12dB
-        cx_write(AUD_AFE_12DB_EN,   0x0001);
+//      cx_write(AUD_AFE_12DB_EN,   0x0001);
+        cx_write(AUD_AFE_12DB_EN,   0x0000);
 
         // start programming
         cx_write(AUD_CTL,           0x0000);
@@ -143,9 +144,15 @@ static void set_audio_finish(struct cx88_core *core)
         u32 volume;
 
         if (cx88_boards[core->board].blackbird) {
+                // sets sound input from external adc
+                cx_set(AUD_CTL, EN_I2SIN_ENABLE);
+                //cx_write(AUD_I2SINPUTCNTL, 0);
+                cx_write(AUD_I2SINPUTCNTL, 4);
+                cx_write(AUD_BAUDRATE, 1);
                 // 'pass-thru mode': this enables the i2s output to the mpeg encoder
-                cx_set(AUD_CTL, 0x2000);
+                cx_set(AUD_CTL, EN_I2SOUT_ENABLE);
                 cx_write(AUD_I2SOUTPUTCNTL, 1);
+                cx_write(AUD_I2SCNTL, 0);
                 //cx_write(AUD_APB_IN_RATE_ADJ, 0);
         }
 
@@ -707,50 +714,65 @@ static void set_audio_standard_EIAJ(struct cx88_core *core)
         set_audio_finish(core);
 }
 
-static void set_audio_standard_FM(struct cx88_core *core)
+static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type deemph)
 {
-#if 0 /* FIXME */
-        switch (dev->audio_properties.FM_deemphasis)
-        {
-                case WW_FM_DEEMPH_50:
-                        //Set De-emphasis filter coefficients for 50 usec
-                        cx_write(AUD_DEEMPH0_G0, 0x0C45);
-                        cx_write(AUD_DEEMPH0_A0, 0x6262);
-                        cx_write(AUD_DEEMPH0_B0, 0x1C29);
-                        cx_write(AUD_DEEMPH0_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH0_B1, 0x399A);
-
-                        cx_write(AUD_DEEMPH1_G0, 0x0D80);
-                        cx_write(AUD_DEEMPH1_A0, 0x6262);
-                        cx_write(AUD_DEEMPH1_B0, 0x1C29);
-                        cx_write(AUD_DEEMPH1_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH1_B1, 0x399A);
+        static const struct rlist fm_deemph_50[] = {
+                { AUD_DEEMPH0_G0,       0x0C45 },
+                { AUD_DEEMPH0_A0,       0x6262 },
+                { AUD_DEEMPH0_B0,       0x1C29 },
+                { AUD_DEEMPH0_A1,       0x3FC66},
+                { AUD_DEEMPH0_B1,       0x399A },
+
+                { AUD_DEEMPH1_G0,       0x0D80 },
+                { AUD_DEEMPH1_A0,       0x6262 },
+                { AUD_DEEMPH1_B0,       0x1C29 },
+                { AUD_DEEMPH1_A1,       0x3FC66},
+                { AUD_DEEMPH1_B1,       0x399A},
+
+                { AUD_POLYPH80SCALEFAC, 0x0003},
+                { /* end of list */ },
+        };
+        static const struct rlist fm_deemph_75[] = {
+                { AUD_DEEMPH0_G0,       0x091B },
+                { AUD_DEEMPH0_A0,       0x6B68 },
+                { AUD_DEEMPH0_B0,       0x11EC },
+                { AUD_DEEMPH0_A1,       0x3FC66},
+                { AUD_DEEMPH0_B1,       0x399A },
+
+                { AUD_DEEMPH1_G0,       0x0AA0 },
+                { AUD_DEEMPH1_A0,       0x6B68 },
+                { AUD_DEEMPH1_B0,       0x11EC },
+                { AUD_DEEMPH1_A1,       0x3FC66},
+                { AUD_DEEMPH1_B1,       0x399A},
+
+                { AUD_POLYPH80SCALEFAC, 0x0003},
+                { /* end of list */ },
+        };
 
-                        break;
+        /* It is enough to leave default values? */
+        static const struct rlist fm_no_deemph[] = {
 
-                case WW_FM_DEEMPH_75:
-                        //Set De-emphasis filter coefficients for 75 usec
-                        cx_write(AUD_DEEMPH0_G0, 0x91B );
-                        cx_write(AUD_DEEMPH0_A0, 0x6B68);
-                        cx_write(AUD_DEEMPH0_B0, 0x11EC);
-                        cx_write(AUD_DEEMPH0_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH0_B1, 0x399A);
+                { AUD_POLYPH80SCALEFAC, 0x0003},
+                { /* end of list */ },
+        };
 
-                        cx_write(AUD_DEEMPH1_G0, 0xAA0 );
-                        cx_write(AUD_DEEMPH1_A0, 0x6B68);
-                        cx_write(AUD_DEEMPH1_B0, 0x11EC);
-                        cx_write(AUD_DEEMPH1_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH1_B1, 0x399A);
+        dprintk("%s (status: unknown)\n",__FUNCTION__);
+        set_audio_start(core, 0x0020, EN_FMRADIO_AUTO_STEREO);
 
+        switch (deemph)
+        {
+                case FM_NO_DEEMPH:
+                        set_audio_registers(core, fm_no_deemph);
                         break;
-        }
-#endif
 
-        dprintk("%s (status: unknown)\n",__FUNCTION__);
-        set_audio_start(core, 0x0020, EN_FMRADIO_AUTO_STEREO);
+                case FM_DEEMPH_50:
+                        set_audio_registers(core, fm_deemph_50);
+                        break;
 
-        // AB: 10/2/01: this register is not being reset appropriately on occasion.
-        cx_write(AUD_POLYPH80SCALEFAC,3);
+                case FM_DEEMPH_75:
+                        set_audio_registers(core, fm_deemph_75);
+                        break;
+        }
 
         set_audio_finish(core);
 }
@@ -778,7 +800,7 @@ void cx88_set_tvaudio(struct cx88_core *core)
                 set_audio_standard_EIAJ(core);
                 break;
         case WW_FM:
-                set_audio_standard_FM(core);
+                set_audio_standard_FM(core,FM_NO_DEEMPH);
                 break;
         case WW_SYSTEM_L_AM:
                 set_audio_standard_NICAM_L(core, 1);
@@ -1029,4 +1051,5 @@ EXPORT_SYMBOL(cx88_audio_thread);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */