5 files changed, 44 insertions, 3 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index c94f97b7939..d094cac9f7a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -360,6 +360,9 @@ int pvr2_encoder_start(struct pvr2_hdw *hdw)
         pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000481);
         pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);
 
+        pvr2_encoder_vcmd(hdw,CX2341X_ENC_MUTE_VIDEO,1,
+                          hdw->input_val == PVR2_CVAL_INPUT_RADIO ? 1 : 0);
+
         if (hdw->config == pvr2_config_vbi) {
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,
                                            0x01,0x14);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 503255cebc2..5f6ab998bbe 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2260,6 +2260,13 @@ static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)
                 stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_CFG);
         }
 
+        if (hdw->input_dirty) {
+                /* pk: If input changes to or from radio, then the encoder
+                   needs to be restarted (for ENC_MUTE_VIDEO to work) */
+                stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_RUN);
+        }
+
+
         if (hdw->srate_dirty) {
                 /* Write new sample rate into control structure since
                  * the master copy is stale.  We must track srate
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 05121666b9b..93b8d077c11 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -39,6 +39,7 @@
 #define OP_AUDIORATE 4
 #define OP_SIZE 5
 #define OP_LOG 6
+#define OP_RADIO 7
 
 static const struct pvr2_i2c_op * const ops[] = {
         [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
@@ -47,6 +48,7 @@ static const struct pvr2_i2c_op * const ops[] = {
         [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,
         [OP_SIZE] = &pvr2_i2c_op_v4l2_size,
         [OP_LOG] = &pvr2_i2c_op_v4l2_log,
+        [OP_RADIO] = &pvr2_i2c_op_v4l2_radio,
 };
 
 void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
@@ -58,7 +60,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
                         (1 << OP_VOLUME) |
                         (1 << OP_FREQ) |
                         (1 << OP_SIZE) |
-                        (1 << OP_LOG));
+                        (1 << OP_LOG) |
+                        (1 << OP_RADIO));
 
         if (id == I2C_DRIVERID_MSP3400) {
                 if (pvr2_i2c_msp3400_setup(hdw,cp)) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 05ea17afe90..50fcceb15d5 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -24,7 +24,7 @@
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
 #include <linux/videodev2.h>
-
+#include <media/v4l2-common.h> /* AUDC_SET_RADIO */
 
 static void set_standard(struct pvr2_hdw *hdw)
 {
@@ -50,6 +50,32 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard = {
 };
 
 
+static void set_radio(struct pvr2_hdw *hdw)
+{
+        pvr2_trace(PVR2_TRACE_CHIPS,
+                           "i2c v4l2 set_radio()");
+
+        if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
+                pvr2_i2c_core_cmd(hdw,AUDC_SET_RADIO,NULL);
+        } else {
+                set_standard(hdw);
+        }
+}
+
+
+static int check_radio(struct pvr2_hdw *hdw)
+{
+        return hdw->input_dirty != 0;
+}
+
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio = {
+        .check = check_radio,
+        .update = set_radio,
+        .name = "v4l2_radio",
+};
+
+
 static void set_bcsh(struct pvr2_hdw *hdw)
 {
         struct v4l2_control ctrl;
@@ -145,7 +171,8 @@ static void set_frequency(struct pvr2_hdw *hdw)
         memset(&freq,0,sizeof(freq));
         freq.frequency = fv / 62500;
         freq.tuner = 0;
-        freq.type = V4L2_TUNER_ANALOG_TV;
+        freq.type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?
+                     V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
         pvr2_i2c_core_cmd(hdw,VIDIOC_S_FREQUENCY,&freq);
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index ecabddba1ec..894de610893 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -26,6 +26,7 @@
 #include "pvrusb2-i2c-core.h"
 
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard;
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;