V4L/DVB (10757): cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_...
[pandora-kernel.git] / drivers / media / video / cx18 / cx18-av-core.c
index 73f5141..f9bb77a 100644 (file)
@@ -4,6 +4,7 @@
  *  Derived from cx25840-core.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
  *  02110-1301, USA.
  */
 
+#include <media/v4l2-chip-ident.h>
 #include "cx18-driver.h"
 #include "cx18-io.h"
+#include "cx18-cards.h"
 
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value)
 {
@@ -36,12 +39,31 @@ int cx18_av_write(struct cx18 *cx, u16 addr, u8 value)
        return 0;
 }
 
+int cx18_av_write_expect(struct cx18 *cx, u16 addr, u8 value, u8 eval, u8 mask)
+{
+       u32 reg = 0xc40000 + (addr & ~3);
+       int shift = (addr & 3) * 8;
+       u32 x = cx18_read_reg(cx, reg);
+
+       x = (x & ~((u32)0xff << shift)) | ((u32)value << shift);
+       cx18_write_reg_expect(cx, x, reg,
+                               ((u32)eval << shift), ((u32)mask << shift));
+       return 0;
+}
+
 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value)
 {
        cx18_write_reg(cx, value, 0xc40000 + addr);
        return 0;
 }
 
+int
+cx18_av_write4_expect(struct cx18 *cx, u16 addr, u32 value, u32 eval, u32 mask)
+{
+       cx18_write_reg_expect(cx, value, 0xc40000 + addr, eval, mask);
+       return 0;
+}
+
 int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value)
 {
        cx18_write_reg_noretry(cx, value, 0xc40000 + addr);
@@ -61,11 +83,6 @@ u32 cx18_av_read4(struct cx18 *cx, u16 addr)
        return cx18_read_reg(cx, 0xc40000 + addr);
 }
 
-u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr)
-{
-       return cx18_read_reg_noretry(cx, 0xc40000 + addr);
-}
-
 int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned and_mask,
                   u8 or_value)
 {
@@ -82,15 +99,6 @@ int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 and_mask,
                             or_value);
 }
 
-/* ----------------------------------------------------------------------- */
-
-static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
-                                       enum cx18_av_audio_input aud_input);
-static void log_audio_status(struct cx18 *cx);
-static void log_video_status(struct cx18 *cx);
-
-/* ----------------------------------------------------------------------- */
-
 static void cx18_av_initialize(struct cx18 *cx)
 {
        struct cx18_av_state *state = &cx->av_state;
@@ -98,14 +106,16 @@ static void cx18_av_initialize(struct cx18 *cx)
 
        cx18_av_loadfw(cx);
        /* Stop 8051 code execution */
-       cx18_av_write4(cx, CXADEC_DL_CTL, 0x03000000);
+       cx18_av_write4_expect(cx, CXADEC_DL_CTL, 0x03000000,
+                                                0x03000000, 0x13000000);
 
        /* initallize the PLL by toggling sleep bit */
        v = cx18_av_read4(cx, CXADEC_HOST_REG1);
-       /* enable sleep mode */
-       cx18_av_write4(cx, CXADEC_HOST_REG1, v | 1);
+       /* enable sleep mode - register appears to be read only... */
+       cx18_av_write4_expect(cx, CXADEC_HOST_REG1, v | 1, v, 0xfffe);
        /* disable sleep mode */
-       cx18_av_write4(cx, CXADEC_HOST_REG1, v & 0xfffe);
+       cx18_av_write4_expect(cx, CXADEC_HOST_REG1, v & 0xfffe,
+                                                   v & 0xfffe, 0xffff);
 
        /* initialize DLLs */
        v = cx18_av_read4(cx, CXADEC_DLL1_DIAG_CTRL) & 0xE1FFFEFF;
@@ -125,9 +135,10 @@ static void cx18_av_initialize(struct cx18 *cx)
 
        v = cx18_av_read4(cx, CXADEC_AFE_DIAG_CTRL3) | 1;
        /* enable TUNE_FIL_RST */
-       cx18_av_write4(cx, CXADEC_AFE_DIAG_CTRL3, v);
+       cx18_av_write4_expect(cx, CXADEC_AFE_DIAG_CTRL3, v, v, 0x03009F0F);
        /* disable TUNE_FIL_RST */
-       cx18_av_write4(cx, CXADEC_AFE_DIAG_CTRL3, v & 0xFFFFFFFE);
+       cx18_av_write4_expect(cx, CXADEC_AFE_DIAG_CTRL3,
+                             v & 0xFFFFFFFE, v & 0xFFFFFFFE, 0x03009F0F);
 
        /* enable 656 output */
        cx18_av_and_or4(cx, CXADEC_PIN_CTRL1, ~0, 0x040C00);
@@ -151,9 +162,14 @@ static void cx18_av_initialize(struct cx18 *cx)
        /* Set VGA_TRACK_RANGE to 0x20 */
        cx18_av_and_or4(cx, CXADEC_DFE_CTRL2, 0xFFFF00FF, 0x00002000);
 
-       /* Enable VBI capture */
-       cx18_av_write4(cx, CXADEC_OUT_CTRL1, 0x4010253F);
-       /* cx18_av_write4(cx, CXADEC_OUT_CTRL1, 0x4010253E); */
+       /*
+        * Initial VBI setup
+        * VIP-1.1, 10 bit mode, enable Raw, disable sliced,
+        * don't clamp raw samples when codes are in use, 1 byte user D-words,
+        * IDID0 has line #, RP code V bit transition on VBLANK, data during
+        * blanking intervals
+        */
+       cx18_av_write4(cx, CXADEC_OUT_CTRL1, 0x4013252e);
 
        /* Set the video input.
           The setting in MODE_CTRL gets lost when we do the above setup */
@@ -177,7 +193,56 @@ static void cx18_av_initialize(struct cx18 *cx)
        state->default_volume = ((state->default_volume / 2) + 23) << 9;
 }
 
-/* ----------------------------------------------------------------------- */
+static int cx18_av_reset(struct v4l2_subdev *sd, u32 val)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
+       cx18_av_initialize(cx);
+       return 0;
+}
+
+static int cx18_av_init(struct v4l2_subdev *sd, u32 val)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
+       switch (val) {
+       case CX18_AV_INIT_PLLS:
+               /*
+                * The crystal freq used in calculations in this driver will be
+                * 28.636360 MHz.
+                * Aim to run the PLLs' VCOs near 400 MHz to minimze errors.
+                */
+
+               /*
+                * VDCLK  Integer = 0x0f, Post Divider = 0x04
+                * AIMCLK Integer = 0x0e, Post Divider = 0x16
+                */
+               cx18_av_write4(cx, CXADEC_PLL_CTRL1, 0x160e040f);
+
+               /* VDCLK Fraction = 0x2be2fe */
+               /* xtal * 0xf.15f17f0/4 = 108 MHz: 432 MHz before post divide */
+               cx18_av_write4(cx, CXADEC_VID_PLL_FRAC, 0x002be2fe);
+
+               /* AIMCLK Fraction = 0x05227ad */
+               /* xtal * 0xe.2913d68/0x16 = 48000 * 384: 406 MHz pre post-div*/
+               cx18_av_write4(cx, CXADEC_AUX_PLL_FRAC, 0x005227ad);
+
+               /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x16 */
+               cx18_av_write(cx, CXADEC_I2S_MCLK, 0x56);
+               break;
+
+       case CX18_AV_INIT_NORMAL:
+       default:
+               if (!state->is_initialized) {
+                       /* initialize on first use */
+                       state->is_initialized = 1;
+                       cx18_av_initialize(cx);
+               }
+               break;
+       }
+       return 0;
+}
 
 void cx18_av_std_setup(struct cx18 *cx)
 {
@@ -195,6 +260,7 @@ void cx18_av_std_setup(struct cx18 *cx)
                cx18_av_write(cx, 0x49f, 0x14);
 
        if (std & V4L2_STD_625_50) {
+               /* FIXME - revisit these for Sliced VBI */
                hblank = 132;
                hactive = 720;
                burst = 93;
@@ -218,13 +284,34 @@ void cx18_av_std_setup(struct cx18 *cx)
                        sc = 672351;
                }
        } else {
+               /*
+                * The following relationships of half line counts should hold:
+                * 525 = vsync + vactive + vblank656
+                * 12 = vblank656 - vblank
+                *
+                * vsync:     always 6 half-lines of vsync pulses
+                * vactive:   half lines of active video
+                * vblank656: half lines, after line 3, of blanked video
+                * vblank:    half lines, after line 9, of blanked video
+                *
+                * vblank656 starts counting from the falling edge of the first
+                *      vsync pulse (start of line 4)
+                * vblank starts counting from the after the 6 vsync pulses and
+                *      6 equalization pulses (start of line 10)
+                *
+                * For 525 line systems the driver will extract VBI information
+                * from lines 10 through 21.  To avoid the EAV RP code from
+                * toggling at the start of hblank at line 22, where sliced VBI
+                * data from line 21 is stuffed, also treat line 22 as blanked.
+                */
+               vblank656 = 38; /* lines  4 through  22 */
+               vblank = 26;    /* lines 10 through  22 */
+               vactive = 481;  /* lines 23 through 262.5 */
+
                hactive = 720;
                hblank = 122;
-               vactive = 487;
                luma_lpf = 1;
                uv_lpf = 1;
-               vblank = 26;
-               vblank656 = 26;
 
                src_decimation = 0x21f;
                if (std == V4L2_STD_PAL_60) {
@@ -251,10 +338,9 @@ void cx18_av_std_setup(struct cx18 *cx)
                        pll_int, pll_frac, pll_post);
 
        if (pll_post) {
-               int fin, fsc;
-               int pll = 28636363L * ((((u64)pll_int) << 25) + pll_frac);
+               int fin, fsc, pll;
 
-               pll >>= 25;
+               pll = (28636360L * ((((u64)pll_int) << 25) + pll_frac)) >> 25;
                pll /= pll_post;
                CX18_DEBUG_INFO("PLL = %d.%06d MHz\n",
                                        pll / 1000000, pll % 1000000);
@@ -308,22 +394,34 @@ void cx18_av_std_setup(struct cx18 *cx)
        cx18_av_write(cx, 0x47d, 0xff & sc >> 8);
        cx18_av_write(cx, 0x47e, 0xff & sc >> 16);
 
-       /* Sets VBI parameters */
        if (std & V4L2_STD_625_50) {
-               cx18_av_write(cx, 0x47f, 0x01);
-               state->vbi_line_offset = 5;
+               state->slicer_line_delay = 1;
+               state->slicer_line_offset = (6 + state->slicer_line_delay - 2);
        } else {
-               cx18_av_write(cx, 0x47f, 0x00);
-               state->vbi_line_offset = 8;
+               state->slicer_line_delay = 0;
+               state->slicer_line_offset = (10 + state->slicer_line_delay - 2);
        }
+       cx18_av_write(cx, 0x47f, state->slicer_line_delay);
+}
+
+static int cx18_av_decode_vbi_line(struct v4l2_subdev *sd,
+                                  struct v4l2_decode_vbi_line *vbi_line)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       return cx18_av_vbi(cx, VIDIOC_INT_DECODE_VBI_LINE, vbi_line);
 }
 
-/* ----------------------------------------------------------------------- */
+static int cx18_av_s_clock_freq(struct v4l2_subdev *sd, u32 freq)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       return cx18_av_audio(cx, VIDIOC_INT_AUDIO_CLOCK_FREQ, &freq);
+}
 
 static void input_change(struct cx18 *cx)
 {
        struct cx18_av_state *state = &cx->av_state;
        v4l2_std_id std = state->std;
+       u8 v;
 
        /* Follow step 8c and 8d of section 3.16 in the cx18_av datasheet */
        cx18_av_write(cx, 0x49f, (std & V4L2_STD_NTSC) ? 0x14 : 0x11);
@@ -333,34 +431,45 @@ static void input_change(struct cx18 *cx)
        if (std & V4L2_STD_525_60) {
                if (std == V4L2_STD_NTSC_M_JP) {
                        /* Japan uses EIAJ audio standard */
-                       cx18_av_write(cx, 0x808, 0xf7);
-                       cx18_av_write(cx, 0x80b, 0x02);
+                       cx18_av_write_expect(cx, 0x808, 0xf7, 0xf7, 0xff);
+                       cx18_av_write_expect(cx, 0x80b, 0x02, 0x02, 0x3f);
                } else if (std == V4L2_STD_NTSC_M_KR) {
                        /* South Korea uses A2 audio standard */
-                       cx18_av_write(cx, 0x808, 0xf8);
-                       cx18_av_write(cx, 0x80b, 0x03);
+                       cx18_av_write_expect(cx, 0x808, 0xf8, 0xf8, 0xff);
+                       cx18_av_write_expect(cx, 0x80b, 0x03, 0x03, 0x3f);
                } else {
                        /* Others use the BTSC audio standard */
-                       cx18_av_write(cx, 0x808, 0xf6);
-                       cx18_av_write(cx, 0x80b, 0x01);
+                       cx18_av_write_expect(cx, 0x808, 0xf6, 0xf6, 0xff);
+                       cx18_av_write_expect(cx, 0x80b, 0x01, 0x01, 0x3f);
                }
        } else if (std & V4L2_STD_PAL) {
                /* Follow tuner change procedure for PAL */
-               cx18_av_write(cx, 0x808, 0xff);
-               cx18_av_write(cx, 0x80b, 0x03);
+               cx18_av_write_expect(cx, 0x808, 0xff, 0xff, 0xff);
+               cx18_av_write_expect(cx, 0x80b, 0x03, 0x03, 0x3f);
        } else if (std & V4L2_STD_SECAM) {
                /* Select autodetect for SECAM */
-               cx18_av_write(cx, 0x808, 0xff);
-               cx18_av_write(cx, 0x80b, 0x03);
+               cx18_av_write_expect(cx, 0x808, 0xff, 0xff, 0xff);
+               cx18_av_write_expect(cx, 0x80b, 0x03, 0x03, 0x3f);
        }
 
-       if (cx18_av_read(cx, 0x803) & 0x10) {
+       v = cx18_av_read(cx, 0x803);
+       if (v & 0x10) {
                /* restart audio decoder microcontroller */
-               cx18_av_and_or(cx, 0x803, ~0x10, 0x00);
-               cx18_av_and_or(cx, 0x803, ~0x10, 0x10);
+               v &= ~0x10;
+               cx18_av_write_expect(cx, 0x803, v, v, 0x1f);
+               v |= 0x10;
+               cx18_av_write_expect(cx, 0x803, v, v, 0x1f);
        }
 }
 
+static int cx18_av_s_frequency(struct v4l2_subdev *sd,
+                              struct v4l2_frequency *freq)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       input_change(cx);
+       return 0;
+}
+
 static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
                                        enum cx18_av_audio_input aud_input)
 {
@@ -368,6 +477,7 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
        u8 is_composite = (vid_input >= CX18_AV_COMPOSITE1 &&
                           vid_input <= CX18_AV_COMPOSITE8);
        u8 reg;
+       u8 v;
 
        CX18_DEBUG_INFO("decoder set video input %d, audio input %d\n",
                        vid_input, aud_input);
@@ -413,16 +523,23 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
                return -EINVAL;
        }
 
-       cx18_av_write(cx, 0x103, reg);
+       cx18_av_write_expect(cx, 0x103, reg, reg, 0xf7);
        /* Set INPUT_MODE to Composite (0) or S-Video (1) */
        cx18_av_and_or(cx, 0x401, ~0x6, is_composite ? 0 : 0x02);
+
        /* Set CH_SEL_ADC2 to 1 if input comes from CH3 */
-       cx18_av_and_or(cx, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0);
+       v = cx18_av_read(cx, 0x102);
+       if (reg & 0x80)
+               v &= ~0x2;
+       else
+               v |= 0x2;
        /* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2 and CH3 */
        if ((reg & 0xc0) != 0xc0 && (reg & 0x30) != 0x30)
-               cx18_av_and_or(cx, 0x102, ~0x4, 4);
+               v |= 0x4;
        else
-               cx18_av_and_or(cx, 0x102, ~0x4, 0);
+               v &= ~0x4;
+       cx18_av_write_expect(cx, 0x102, v, v, 0x17);
+
        /*cx18_av_and_or4(cx, 0x104, ~0x001b4180, 0x00004180);*/
 
        state->vid_input = vid_input;
@@ -432,14 +549,118 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
        return 0;
 }
 
-/* ----------------------------------------------------------------------- */
+static int cx18_av_s_video_routing(struct v4l2_subdev *sd,
+                                  const struct v4l2_routing *route)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       return set_input(cx, route->input, state->aud_input);
+}
 
-static int set_v4lstd(struct cx18 *cx)
+static int cx18_av_s_audio_routing(struct v4l2_subdev *sd,
+                                  const struct v4l2_routing *route)
 {
-       struct cx18_av_state *state = &cx->av_state;
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       return set_input(cx, state->vid_input, route->input);
+}
+
+static int cx18_av_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       u8 vpres;
+       u8 mode;
+       int val = 0;
+
+       if (state->radio)
+               return 0;
+
+       vpres = cx18_av_read(cx, 0x40e) & 0x20;
+       vt->signal = vpres ? 0xffff : 0x0;
+
+       vt->capability |=
+                   V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 |
+                   V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
+
+       mode = cx18_av_read(cx, 0x804);
+
+       /* get rxsubchans and audmode */
+       if ((mode & 0xf) == 1)
+               val |= V4L2_TUNER_SUB_STEREO;
+       else
+               val |= V4L2_TUNER_SUB_MONO;
+
+       if (mode == 2 || mode == 4)
+               val = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
+
+       if (mode & 0x10)
+               val |= V4L2_TUNER_SUB_SAP;
+
+       vt->rxsubchans = val;
+       vt->audmode = state->audmode;
+       return 0;
+}
+
+static int cx18_av_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       u8 v;
+
+       if (state->radio)
+               return 0;
+
+       v = cx18_av_read(cx, 0x809);
+       v &= ~0xf;
+
+       switch (vt->audmode) {
+       case V4L2_TUNER_MODE_MONO:
+               /* mono      -> mono
+                  stereo    -> mono
+                  bilingual -> lang1 */
+               break;
+       case V4L2_TUNER_MODE_STEREO:
+       case V4L2_TUNER_MODE_LANG1:
+               /* mono      -> mono
+                  stereo    -> stereo
+                  bilingual -> lang1 */
+               v |= 0x4;
+               break;
+       case V4L2_TUNER_MODE_LANG1_LANG2:
+               /* mono      -> mono
+                  stereo    -> stereo
+                  bilingual -> lang1/lang2 */
+               v |= 0x7;
+               break;
+       case V4L2_TUNER_MODE_LANG2:
+               /* mono      -> mono
+                  stereo    -> stereo
+                  bilingual -> lang2 */
+               v |= 0x1;
+               break;
+       default:
+               return -EINVAL;
+       }
+       cx18_av_write_expect(cx, 0x809, v, v, 0xff);
+       state->audmode = vt->audmode;
+       return 0;
+}
+
+static int cx18_av_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
        u8 fmt = 0;     /* zero is autodetect */
        u8 pal_m = 0;
 
+       if (state->radio == 0 && state->std == norm)
+               return 0;
+
+       state->radio = 0;
+       state->std = norm;
+
        /* First tests should be against specific std */
        if (state->std == V4L2_STD_NTSC_M_JP) {
                fmt = 0x2;
@@ -482,10 +703,17 @@ static int set_v4lstd(struct cx18 *cx)
        return 0;
 }
 
-/* ----------------------------------------------------------------------- */
+static int cx18_av_s_radio(struct v4l2_subdev *sd)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       state->radio = 1;
+       return 0;
+}
 
-static int set_v4lctrl(struct cx18 *cx, struct v4l2_control *ctrl)
+static int cx18_av_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
        switch (ctrl->id) {
        case V4L2_CID_BRIGHTNESS:
                if (ctrl->value < 0 || ctrl->value > 255) {
@@ -519,7 +747,7 @@ static int set_v4lctrl(struct cx18 *cx, struct v4l2_control *ctrl)
                break;
 
        case V4L2_CID_HUE:
-               if (ctrl->value < -127 || ctrl->value > 127) {
+               if (ctrl->value < -128 || ctrl->value > 127) {
                        CX18_ERR("invalid hue setting %d\n", ctrl->value);
                        return -ERANGE;
                }
@@ -537,12 +765,13 @@ static int set_v4lctrl(struct cx18 *cx, struct v4l2_control *ctrl)
        default:
                return -EINVAL;
        }
-
        return 0;
 }
 
-static int get_v4lctrl(struct cx18 *cx, struct v4l2_control *ctrl)
+static int cx18_av_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
        switch (ctrl->id) {
        case V4L2_CID_BRIGHTNESS:
                ctrl->value = (s8)cx18_av_read(cx, 0x414) + 128;
@@ -565,27 +794,59 @@ static int get_v4lctrl(struct cx18 *cx, struct v4l2_control *ctrl)
        default:
                return -EINVAL;
        }
-
        return 0;
 }
 
-/* ----------------------------------------------------------------------- */
+static int cx18_av_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+
+       switch (qc->id) {
+       case V4L2_CID_BRIGHTNESS:
+               return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
+       case V4L2_CID_CONTRAST:
+       case V4L2_CID_SATURATION:
+               return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
+       case V4L2_CID_HUE:
+               return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
+       default:
+               break;
+       }
+
+       switch (qc->id) {
+       case V4L2_CID_AUDIO_VOLUME:
+               return v4l2_ctrl_query_fill(qc, 0, 65535,
+                       65535 / 100, state->default_volume);
+       case V4L2_CID_AUDIO_MUTE:
+               return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
+       case V4L2_CID_AUDIO_BALANCE:
+       case V4L2_CID_AUDIO_BASS:
+       case V4L2_CID_AUDIO_TREBLE:
+               return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
+       default:
+               return -EINVAL;
+       }
+       return -EINVAL;
+}
 
-static int get_v4lfmt(struct cx18 *cx, struct v4l2_format *fmt)
+static int cx18_av_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
 {
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
        switch (fmt->type) {
        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
                return cx18_av_vbi(cx, VIDIOC_G_FMT, fmt);
        default:
                return -EINVAL;
        }
-
        return 0;
 }
 
-static int set_v4lfmt(struct cx18 *cx, struct v4l2_format *fmt)
+static int cx18_av_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
 {
-       struct cx18_av_state *state = &cx->av_state;
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
        struct v4l2_pix_format *pix;
        int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
        int is_50Hz = !(state->std & V4L2_STD_525_60);
@@ -645,216 +906,24 @@ static int set_v4lfmt(struct cx18 *cx, struct v4l2_format *fmt)
        default:
                return -EINVAL;
        }
-
        return 0;
 }
 
-/* ----------------------------------------------------------------------- */
-
-int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg)
+static int cx18_av_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct cx18_av_state *state = &cx->av_state;
-       struct v4l2_tuner *vt = arg;
-       struct v4l2_routing *route = arg;
-
-       /* ignore these commands */
-       switch (cmd) {
-       case TUNER_SET_TYPE_ADDR:
-               return 0;
-       }
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
 
-       if (!state->is_initialized) {
-               CX18_DEBUG_INFO("cmd %08x triggered fw load\n", cmd);
-               /* initialize on first use */
-               state->is_initialized = 1;
-               cx18_av_initialize(cx);
-       }
-
-       switch (cmd) {
-       case VIDIOC_INT_DECODE_VBI_LINE:
-               return cx18_av_vbi(cx, cmd, arg);
-
-       case VIDIOC_INT_AUDIO_CLOCK_FREQ:
-               return cx18_av_audio(cx, cmd, arg);
-
-       case VIDIOC_STREAMON:
-               CX18_DEBUG_INFO("enable output\n");
+       CX18_DEBUG_INFO("%s output\n", enable ? "enable" : "disable");
+       if (enable) {
                cx18_av_write(cx, 0x115, 0x8c);
                cx18_av_write(cx, 0x116, 0x07);
-               break;
-
-       case VIDIOC_STREAMOFF:
-               CX18_DEBUG_INFO("disable output\n");
+       } else {
                cx18_av_write(cx, 0x115, 0x00);
                cx18_av_write(cx, 0x116, 0x00);
-               break;
-
-       case VIDIOC_LOG_STATUS:
-               log_video_status(cx);
-               log_audio_status(cx);
-               break;
-
-       case VIDIOC_G_CTRL:
-               return get_v4lctrl(cx, (struct v4l2_control *)arg);
-
-       case VIDIOC_S_CTRL:
-               return set_v4lctrl(cx, (struct v4l2_control *)arg);
-
-       case VIDIOC_QUERYCTRL:
-       {
-               struct v4l2_queryctrl *qc = arg;
-
-               switch (qc->id) {
-               case V4L2_CID_BRIGHTNESS:
-               case V4L2_CID_CONTRAST:
-               case V4L2_CID_SATURATION:
-               case V4L2_CID_HUE:
-                       return v4l2_ctrl_query_fill_std(qc);
-               default:
-                       break;
-               }
-
-               switch (qc->id) {
-               case V4L2_CID_AUDIO_VOLUME:
-                       return v4l2_ctrl_query_fill(qc, 0, 65535,
-                               65535 / 100, state->default_volume);
-               case V4L2_CID_AUDIO_MUTE:
-               case V4L2_CID_AUDIO_BALANCE:
-               case V4L2_CID_AUDIO_BASS:
-               case V4L2_CID_AUDIO_TREBLE:
-                       return v4l2_ctrl_query_fill_std(qc);
-               default:
-                       return -EINVAL;
-               }
-               return -EINVAL;
-       }
-
-       case VIDIOC_G_STD:
-               *(v4l2_std_id *)arg = state->std;
-               break;
-
-       case VIDIOC_S_STD:
-               if (state->radio == 0 && state->std == *(v4l2_std_id *)arg)
-                       return 0;
-               state->radio = 0;
-               state->std = *(v4l2_std_id *)arg;
-               return set_v4lstd(cx);
-
-       case AUDC_SET_RADIO:
-               state->radio = 1;
-               break;
-
-       case VIDIOC_INT_G_VIDEO_ROUTING:
-               route->input = state->vid_input;
-               route->output = 0;
-               break;
-
-       case VIDIOC_INT_S_VIDEO_ROUTING:
-               return set_input(cx, route->input, state->aud_input);
-
-       case VIDIOC_INT_G_AUDIO_ROUTING:
-               route->input = state->aud_input;
-               route->output = 0;
-               break;
-
-       case VIDIOC_INT_S_AUDIO_ROUTING:
-               return set_input(cx, state->vid_input, route->input);
-
-       case VIDIOC_S_FREQUENCY:
-               input_change(cx);
-               break;
-
-       case VIDIOC_G_TUNER:
-       {
-               u8 vpres = cx18_av_read(cx, 0x40e) & 0x20;
-               u8 mode;
-               int val = 0;
-
-               if (state->radio)
-                       break;
-
-               vt->signal = vpres ? 0xffff : 0x0;
-
-               vt->capability |=
-                   V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 |
-                   V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
-
-               mode = cx18_av_read(cx, 0x804);
-
-               /* get rxsubchans and audmode */
-               if ((mode & 0xf) == 1)
-                       val |= V4L2_TUNER_SUB_STEREO;
-               else
-                       val |= V4L2_TUNER_SUB_MONO;
-
-               if (mode == 2 || mode == 4)
-                       val = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
-
-               if (mode & 0x10)
-                       val |= V4L2_TUNER_SUB_SAP;
-
-               vt->rxsubchans = val;
-               vt->audmode = state->audmode;
-               break;
-       }
-
-       case VIDIOC_S_TUNER:
-               if (state->radio)
-                       break;
-
-               switch (vt->audmode) {
-               case V4L2_TUNER_MODE_MONO:
-                       /* mono      -> mono
-                          stereo    -> mono
-                          bilingual -> lang1 */
-                       cx18_av_and_or(cx, 0x809, ~0xf, 0x00);
-                       break;
-               case V4L2_TUNER_MODE_STEREO:
-               case V4L2_TUNER_MODE_LANG1:
-                       /* mono      -> mono
-                          stereo    -> stereo
-                          bilingual -> lang1 */
-                       cx18_av_and_or(cx, 0x809, ~0xf, 0x04);
-                       break;
-               case V4L2_TUNER_MODE_LANG1_LANG2:
-                       /* mono      -> mono
-                          stereo    -> stereo
-                          bilingual -> lang1/lang2 */
-                       cx18_av_and_or(cx, 0x809, ~0xf, 0x07);
-                       break;
-               case V4L2_TUNER_MODE_LANG2:
-                       /* mono      -> mono
-                          stereo    -> stereo
-                          bilingual -> lang2 */
-                       cx18_av_and_or(cx, 0x809, ~0xf, 0x01);
-                       break;
-               default:
-                       return -EINVAL;
-               }
-               state->audmode = vt->audmode;
-               break;
-
-       case VIDIOC_G_FMT:
-               return get_v4lfmt(cx, (struct v4l2_format *)arg);
-
-       case VIDIOC_S_FMT:
-               return set_v4lfmt(cx, (struct v4l2_format *)arg);
-
-       case VIDIOC_INT_RESET:
-               cx18_av_initialize(cx);
-               break;
-
-       default:
-               return -EINVAL;
        }
-
        return 0;
 }
 
-/* ----------------------------------------------------------------------- */
-
-/* ----------------------------------------------------------------------- */
-
 static void log_video_status(struct cx18 *cx)
 {
        static const char *const fmt_strs[] = {
@@ -892,8 +961,6 @@ static void log_video_status(struct cx18 *cx)
        CX18_INFO("Specified audioclock freq: %d Hz\n", state->audclk_freq);
 }
 
-/* ----------------------------------------------------------------------- */
-
 static void log_audio_status(struct cx18 *cx)
 {
        struct cx18_av_state *state = &cx->av_state;
@@ -1041,3 +1108,132 @@ static void log_audio_status(struct cx18 *cx)
                CX18_INFO("Selected 45 MHz format:    %s\n", p);
        }
 }
+
+static int cx18_av_log_status(struct v4l2_subdev *sd)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+       log_video_status(cx);
+       log_audio_status(cx);
+       return 0;
+}
+
+static inline int cx18_av_dbg_match(const struct v4l2_dbg_match *match)
+{
+       return match->type == V4L2_CHIP_MATCH_HOST && match->addr == 1;
+}
+
+static int cx18_av_g_chip_ident(struct v4l2_subdev *sd,
+                               struct v4l2_dbg_chip_ident *chip)
+{
+       struct cx18_av_state *state = to_cx18_av_state(sd);
+
+       if (cx18_av_dbg_match(&chip->match)) {
+               chip->ident = state->id;
+               chip->revision = state->rev;
+       }
+       return 0;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int cx18_av_g_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
+       if (!cx18_av_dbg_match(&reg->match))
+               return -EINVAL;
+       if ((reg->reg & 0x3) != 0)
+               return -EINVAL;
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+       reg->size = 4;
+       reg->val = cx18_av_read4(cx, reg->reg & 0x00000ffc);
+       return 0;
+}
+
+static int cx18_av_s_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
+{
+       struct cx18 *cx = v4l2_get_subdevdata(sd);
+
+       if (!cx18_av_dbg_match(&reg->match))
+               return -EINVAL;
+       if ((reg->reg & 0x3) != 0)
+               return -EINVAL;
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+       cx18_av_write4(cx, reg->reg & 0x00000ffc, reg->val);
+       return 0;
+}
+#endif
+
+static const struct v4l2_subdev_core_ops cx18_av_general_ops = {
+       .g_chip_ident = cx18_av_g_chip_ident,
+       .log_status = cx18_av_log_status,
+       .init = cx18_av_init,
+       .reset = cx18_av_reset,
+       .queryctrl = cx18_av_queryctrl,
+       .g_ctrl = cx18_av_g_ctrl,
+       .s_ctrl = cx18_av_s_ctrl,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .g_register = cx18_av_g_register,
+       .s_register = cx18_av_s_register,
+#endif
+};
+
+static const struct v4l2_subdev_tuner_ops cx18_av_tuner_ops = {
+       .s_radio = cx18_av_s_radio,
+       .s_frequency = cx18_av_s_frequency,
+       .g_tuner = cx18_av_g_tuner,
+       .s_tuner = cx18_av_s_tuner,
+       .s_std = cx18_av_s_std,
+};
+
+static const struct v4l2_subdev_audio_ops cx18_av_audio_ops = {
+       .s_clock_freq = cx18_av_s_clock_freq,
+       .s_routing = cx18_av_s_audio_routing,
+};
+
+static const struct v4l2_subdev_video_ops cx18_av_video_ops = {
+       .s_routing = cx18_av_s_video_routing,
+       .decode_vbi_line = cx18_av_decode_vbi_line,
+       .s_stream = cx18_av_s_stream,
+       .g_fmt = cx18_av_g_fmt,
+       .s_fmt = cx18_av_s_fmt,
+};
+
+static const struct v4l2_subdev_ops cx18_av_ops = {
+       .core = &cx18_av_general_ops,
+       .tuner = &cx18_av_tuner_ops,
+       .audio = &cx18_av_audio_ops,
+       .video = &cx18_av_video_ops,
+};
+
+int cx18_av_probe(struct cx18 *cx, struct v4l2_subdev **sd)
+{
+       struct cx18_av_state *state = &cx->av_state;
+
+       state->rev = cx18_av_read4(cx, CXADEC_CHIP_CTRL) & 0xffff;
+       state->id = ((state->rev >> 4) == CXADEC_CHIP_TYPE_MAKO)
+                   ? V4L2_IDENT_CX23418_843 : V4L2_IDENT_UNKNOWN;
+
+       state->vid_input = CX18_AV_COMPOSITE7;
+       state->aud_input = CX18_AV_AUDIO8;
+       state->audclk_freq = 48000;
+       state->audmode = V4L2_TUNER_MODE_LANG1;
+       state->slicer_line_delay = 0;
+       state->slicer_line_offset = (10 + state->slicer_line_delay - 2);
+
+       *sd = &state->sd;
+       v4l2_subdev_init(*sd, &cx18_av_ops);
+       v4l2_set_subdevdata(*sd, cx);
+       snprintf((*sd)->name, sizeof((*sd)->name),
+                "%s internal A/V decoder", cx->v4l2_dev.name);
+       (*sd)->grp_id = CX18_HW_CX23418;
+       return v4l2_device_register_subdev(&cx->v4l2_dev, *sd);
+}
+
+void cx18_av_exit(struct cx18 *cx, struct v4l2_subdev *sd)
+{
+       v4l2_device_unregister_subdev(&cx->av_state.sd);
+}