Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
  V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
  V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
  V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
  V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
  V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
  V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
  V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
  V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
  V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
  V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
  V4L/DVB (7719): pvrusb2: Implement input selection enforcement
  V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
  V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
  V4L/DVB (7716): pvrusb2: clean up global functions
  V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
  V4L/DVB (7714): pvrusb2: Fix hang on module removal
  V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
  V4L/DVB (7712): pvrusb2: Close connect/disconnect race
  V4L/DVB (7711): pvrusb2: Fix race on module unload
  V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
  ...

4 files changed, 48 insertions, 68 deletions

diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 756a1eeb274e..7fde678b2c4a 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -352,7 +352,7 @@ static void cx23885_initialize(struct i2c_client *client)
 static void input_change(struct i2c_client *client)
 {
         struct cx25840_state *state = i2c_get_clientdata(client);
-        v4l2_std_id std = cx25840_get_v4lstd(client);
+        v4l2_std_id std = state->std;
 
         /* Follow step 8c and 8d of section 3.16 in the cx25840 datasheet */
         if (std & V4L2_STD_SECAM) {
@@ -523,32 +523,34 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
 
 /* ----------------------------------------------------------------------- */
 
-static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
+static int set_v4lstd(struct i2c_client *client)
 {
-        u8 fmt=0;       /* zero is autodetect */
+        struct cx25840_state *state = i2c_get_clientdata(client);
+        u8 fmt = 0;     /* zero is autodetect */
+        u8 pal_m = 0;
 
         /* First tests should be against specific std */
-        if (std == V4L2_STD_NTSC_M_JP) {
-                fmt=0x2;
-        } else if (std == V4L2_STD_NTSC_443) {
-                fmt=0x3;
-        } else if (std == V4L2_STD_PAL_M) {
-                fmt=0x5;
-        } else if (std == V4L2_STD_PAL_N) {
-                fmt=0x6;
-        } else if (std == V4L2_STD_PAL_Nc) {
-                fmt=0x7;
-        } else if (std == V4L2_STD_PAL_60) {
-                fmt=0x8;
+        if (state->std == V4L2_STD_NTSC_M_JP) {
+                fmt = 0x2;
+        } else if (state->std == V4L2_STD_NTSC_443) {
+                fmt = 0x3;
+        } else if (state->std == V4L2_STD_PAL_M) {
+                pal_m = 1;
+                fmt = 0x5;
+        } else if (state->std == V4L2_STD_PAL_N) {
+                fmt = 0x6;
+        } else if (state->std == V4L2_STD_PAL_Nc) {
+                fmt = 0x7;
+        } else if (state->std == V4L2_STD_PAL_60) {
+                fmt = 0x8;
         } else {
                 /* Then, test against generic ones */
-                if (std & V4L2_STD_NTSC) {
-                        fmt=0x1;
-                } else if (std & V4L2_STD_PAL) {
-                        fmt=0x4;
-                } else if (std & V4L2_STD_SECAM) {
-                        fmt=0xc;
-                }
+                if (state->std & V4L2_STD_NTSC)
+                        fmt = 0x1;
+                else if (state->std & V4L2_STD_PAL)
+                        fmt = 0x4;
+                else if (state->std & V4L2_STD_SECAM)
+                        fmt = 0xc;
         }
 
         v4l_dbg(1, cx25840_debug, client, "changing video std to fmt %i\n",fmt);
@@ -563,42 +565,13 @@ static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
                 cx25840_and_or(client, 0x47b, ~6, 0);
         }
         cx25840_and_or(client, 0x400, ~0xf, fmt);
+        cx25840_and_or(client, 0x403, ~0x3, pal_m);
         cx25840_vbi_setup(client);
+        if (!state->is_cx25836)
+                input_change(client);
         return 0;
 }
 
-v4l2_std_id cx25840_get_v4lstd(struct i2c_client * client)
-{
-        struct cx25840_state *state = i2c_get_clientdata(client);
-        /* check VID_FMT_SEL first */
-        u8 fmt = cx25840_read(client, 0x400) & 0xf;
-
-        if (!fmt) {
-                /* check AFD_FMT_STAT if set to autodetect */
-                fmt = cx25840_read(client, 0x40d) & 0xf;
-        }
-
-        switch (fmt) {
-        case 0x1:
-        {
-                /* if the audio std is A2-M, then this is the South Korean
-                   NTSC standard */
-                if (!state->is_cx25836 && cx25840_read(client, 0x805) == 2)
-                        return V4L2_STD_NTSC_M_KR;
-                return V4L2_STD_NTSC_M;
-        }
-        case 0x2: return V4L2_STD_NTSC_M_JP;
-        case 0x3: return V4L2_STD_NTSC_443;
-        case 0x4: return V4L2_STD_PAL;
-        case 0x5: return V4L2_STD_PAL_M;
-        case 0x6: return V4L2_STD_PAL_N;
-        case 0x7: return V4L2_STD_PAL_Nc;
-        case 0x8: return V4L2_STD_PAL_60;
-        case 0xc: return V4L2_STD_SECAM;
-        default: return V4L2_STD_UNKNOWN;
-        }
-}
-
 /* ----------------------------------------------------------------------- */
 
 static int set_v4lctrl(struct i2c_client *client, struct v4l2_control *ctrl)
@@ -718,9 +691,10 @@ static int get_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
 
 static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
 {
+        struct cx25840_state *state = i2c_get_clientdata(client);
         struct v4l2_pix_format *pix;
         int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
-        int is_50Hz = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
+        int is_50Hz = !(state->std & V4L2_STD_525_60);
 
         switch (fmt->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
@@ -1096,12 +1070,15 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
         }
 
         case VIDIOC_G_STD:
-                *(v4l2_std_id *)arg = cx25840_get_v4lstd(client);
+                *(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;
-                return set_v4lstd(client, *(v4l2_std_id *)arg);
+                state->std = *(v4l2_std_id *)arg;
+                return set_v4lstd(client);
 
         case AUDC_SET_RADIO:
                 state->radio = 1;
@@ -1291,6 +1268,12 @@ static int cx25840_probe(struct i2c_client *client)
         state->id = id;
         state->rev = device_id;
 
+        if (state->is_cx23885) {
+                /* Drive GPIO2 direction and values */
+                cx25840_write(client, 0x160, 0x1d);
+                cx25840_write(client, 0x164, 0x00);
+        }
+
         return 0;
 }
 
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index 95093edc9186..8bf797f48b09 100644
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -38,6 +38,7 @@ struct cx25840_state {
         struct i2c_client *c;
         int pvr150_workaround;
         int radio;
+        v4l2_std_id std;
         enum cx25840_video_input vid_input;
         enum cx25840_audio_input aud_input;
         u32 audclk_freq;
@@ -60,7 +61,6 @@ int cx25840_write4(struct i2c_client *client, u16 addr, u32 value);
 u8 cx25840_read(struct i2c_client *client, u16 addr);
 u32 cx25840_read4(struct i2c_client *client, u16 addr);
 int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned mask, u8 value);
-v4l2_std_id cx25840_get_v4lstd(struct i2c_client *client);
 
 /* ----------------------------------------------------------------------- */
 /* cx25850-firmware.c                                                      */
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 1ddf724a2c74..620d295947ab 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -79,11 +79,9 @@ static int check_fw_load(struct i2c_client *client, int size)
         return 0;
 }
 
-static int fw_write(struct i2c_client *client, u8 * data, int size)
+static int fw_write(struct i2c_client *client, u8 *data, int size)
 {
-        int sent;
-
-        if ((sent = i2c_master_send(client, data, size)) < size) {
+        if (i2c_master_send(client, data, size) < size) {
                 v4l_err(client, "firmware load i2c failure\n");
                 return -ENOSYS;
         }
@@ -96,7 +94,7 @@ int cx25840_loadfw(struct i2c_client *client)
         struct cx25840_state *state = i2c_get_clientdata(client);
         const struct firmware *fw = NULL;
         u8 buffer[4], *ptr;
-        int size, send, retval;
+        int size, retval;
 
         if (state->is_cx23885)
                 firmware = FWFILE_CX23885;
@@ -124,8 +122,7 @@ int cx25840_loadfw(struct i2c_client *client)
         while (size > 0) {
                 ptr[0] = 0x08;
                 ptr[1] = 0x02;
-                send = size > (FWSEND - 2) ? FWSEND : size + 2;
-                retval = fw_write(client, ptr, send);
+                retval = fw_write(client, ptr, min(FWSEND, size + 2));
 
                 if (retval < 0) {
                         release_firmware(fw);
diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c
index 6828f59b9d83..c754b9d13369 100644
--- a/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/drivers/media/video/cx25840/cx25840-vbi.c
@@ -85,7 +85,7 @@ static int decode_vps(u8 * dst, u8 * p)
 void cx25840_vbi_setup(struct i2c_client *client)
 {
         struct cx25840_state *state = i2c_get_clientdata(client);
-        v4l2_std_id std = cx25840_get_v4lstd(client);
+        v4l2_std_id std = state->std;
         int hblank,hactive,burst,vblank,vactive,sc,vblank656,src_decimation;
         int luma_lpf,uv_lpf, comb;
         u32 pll_int,pll_frac,pll_post;
@@ -242,7 +242,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                         0, 0, V4L2_SLICED_VPS, 0, 0,    /* 9 */
                         0, 0, 0, 0
                 };
-                int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
+                int is_pal = !(state->std & V4L2_STD_525_60);
                 int i;
 
                 fmt = arg;
@@ -279,7 +279,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
 
         case VIDIOC_S_FMT:
         {
-                int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
+                int is_pal = !(state->std & V4L2_STD_525_60);
                 int vbi_offset = is_pal ? 1 : 0;
                 int i, x;
                 u8 lcr[24];