V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET

[safe/jmp/linux-2.6] / drivers / media / video / cx18 / cx18-audio.c

diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c
index d19bd77..3526892 100644 (file)
--- a/drivers/media/video/cx18/cx18-audio.c
+++ b/drivers/media/video/cx18/cx18-audio.c
@@ -23,64 +23,70 @@
 
 #include "cx18-driver.h"
 #include "cx18-io.h"
-#include "cx18-i2c.h"
 #include "cx18-cards.h"
 #include "cx18-audio.h"
 
-#define CX18_AUDIO_ENABLE 0xc72014
+#define CX18_AUDIO_ENABLE    0xc72014
+#define CX18_AI1_MUX_MASK    0x30
+#define CX18_AI1_MUX_I2S1    0x00
+#define CX18_AI1_MUX_I2S2    0x10
+#define CX18_AI1_MUX_843_I2S 0x20
 
 /* Selects the audio input and output according to the current
    settings. */
 int cx18_audio_set_io(struct cx18 *cx)
 {
-       struct v4l2_routing route;
-       u32 audio_input;
-       u32 val;
-       int mux_input;
+       const struct cx18_card_audio_input *in;
+       u32 u, v;
        int err;
 
        /* Determine which input to use */
-       if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags)) {
-               audio_input = cx->card->radio_input.audio_input;
-               mux_input = cx->card->radio_input.muxer_input;
-       } else {
-               audio_input =
-                       cx->card->audio_inputs[cx->audio_input].audio_input;
-               mux_input =
-                       cx->card->audio_inputs[cx->audio_input].muxer_input;
-       }
+       if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags))
+               in = &cx->card->radio_input;
+       else
+               in = &cx->card->audio_inputs[cx->audio_input];
 
        /* handle muxer chips */
-       route.input = mux_input;
-       route.output = 0;
-       cx18_i2c_hw(cx, cx->card->hw_muxer, VIDIOC_INT_S_AUDIO_ROUTING, &route);
+       v4l2_subdev_call(cx->sd_extmux, audio, s_routing,
+                        (u32) in->muxer_input, 0, 0);
 
-       route.input = audio_input;
-       err = cx18_i2c_hw(cx, cx->card->hw_audio_ctrl,
-                       VIDIOC_INT_S_AUDIO_ROUTING, &route);
+       err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl,
+                              audio, s_routing, in->audio_input, 0, 0);
        if (err)
                return err;
 
-       val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) & ~0x30;
-       val |= (audio_input > CX18_AV_AUDIO_SERIAL2) ? 0x20 :
-                                       (audio_input << 4);
-       cx18_write_reg_expect(cx, val | 0xb00, CX18_AUDIO_ENABLE, val, 0x30);
+       /* FIXME - this internal mux should be abstracted to a subdev */
+       u = cx18_read_reg(cx, CX18_AUDIO_ENABLE);
+       v = u & ~CX18_AI1_MUX_MASK;
+       switch (in->audio_input) {
+       case CX18_AV_AUDIO_SERIAL1:
+               v |= CX18_AI1_MUX_I2S1;
+               break;
+       case CX18_AV_AUDIO_SERIAL2:
+               v |= CX18_AI1_MUX_I2S2;
+               break;
+       default:
+               v |= CX18_AI1_MUX_843_I2S;
+               break;
+       }
+       if (v == u) {
+               /* force a toggle of some AI1 MUX control bits */
+               u &= ~CX18_AI1_MUX_MASK;
+               switch (in->audio_input) {
+               case CX18_AV_AUDIO_SERIAL1:
+                       u |= CX18_AI1_MUX_843_I2S;
+                       break;
+               case CX18_AV_AUDIO_SERIAL2:
+                       u |= CX18_AI1_MUX_843_I2S;
+                       break;
+               default:
+                       u |= CX18_AI1_MUX_I2S1;
+                       break;
+               }
+               cx18_write_reg_expect(cx, u | 0xb00, CX18_AUDIO_ENABLE,
+                                     u, CX18_AI1_MUX_MASK);
+       }
+       cx18_write_reg_expect(cx, v | 0xb00, CX18_AUDIO_ENABLE,
+                             v, CX18_AI1_MUX_MASK);
        return 0;
 }
-
-void cx18_audio_set_route(struct cx18 *cx, struct v4l2_routing *route)
-{
-       cx18_i2c_hw(cx, cx->card->hw_audio_ctrl,
-                       VIDIOC_INT_S_AUDIO_ROUTING, route);
-}
-
-void cx18_audio_set_audio_clock_freq(struct cx18 *cx, u8 freq)
-{
-       static u32 freqs[3] = { 44100, 48000, 32000 };
-
-       /* The audio clock of the digitizer must match the codec sample
-          rate otherwise you get some very strange effects. */
-       if (freq > 2)
-               return;
-       cx18_call_i2c_clients(cx, VIDIOC_INT_AUDIO_CLOCK_FREQ, &freqs[freq]);
-}