From: Raja Mani <raja_m...@ti.com>

Add support for the following new Control IDs (CID)
   V4L2_CID_FM_RX_CLASS    - FM RX Tuner controls
   V4L2_CID_FM_BAND        - FM band
   V4L2_CID_RSSI_THRESHOLD - RSSI Threshold
   V4L2_CID_TUNE_AF        - Alternative Frequency

Signed-off-by: Raja Mani <raja_m...@ti.com>
Signed-off-by: Pramodh AG <pramodh...@ti.com>
---
 drivers/media/video/v4l2-common.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/v4l2-common.c 
b/drivers/media/video/v4l2-common.c
index 4e53b0b..33c3037 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -354,6 +354,12 @@ const char **v4l2_ctrl_get_menu(u32 id)
                "75 useconds",
                NULL,
        };
+       static const char *fm_band[] = {
+               "87.5 - 108. MHz",
+               "76. - 90. MHz, Japan",
+               "65. - 74. MHz, OIRT",
+               NULL,
+       };
 
        switch (id) {
                case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
@@ -394,6 +400,8 @@ const char **v4l2_ctrl_get_menu(u32 id)
                        return colorfx;
                case V4L2_CID_TUNE_PREEMPHASIS:
                        return tune_preemphasis;
+               case V4L2_CID_FM_BAND:
+                       return fm_band;
                default:
                        return NULL;
        }
@@ -520,6 +528,10 @@ const char *v4l2_ctrl_get_name(u32 id)
        case V4L2_CID_TUNE_PREEMPHASIS: return "Pre-emphasis settings";
        case V4L2_CID_TUNE_POWER_LEVEL:         return "Tune Power Level";
        case V4L2_CID_TUNE_ANTENNA_CAPACITOR:   return "Tune Antenna Capacitor";
+       case V4L2_CID_FM_RX_CLASS:      return "FM Radio Tuner Controls";
+       case V4L2_CID_FM_BAND:          return "FM Band";
+       case V4L2_CID_RSSI_THRESHOLD:   return "RSSI Threshold";
+       case V4L2_CID_TUNE_AF:          return "Alternative Frequency";
 
        default:
                return NULL;
@@ -585,6 +597,9 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 
min, s32 max, s32 ste
        case V4L2_CID_EXPOSURE_AUTO:
        case V4L2_CID_COLORFX:
        case V4L2_CID_TUNE_PREEMPHASIS:
+       case V4L2_CID_FM_BAND:
+       case V4L2_CID_RSSI_THRESHOLD:
+       case V4L2_CID_TUNE_AF:
                qctrl->type = V4L2_CTRL_TYPE_MENU;
                step = 1;
                break;
@@ -596,6 +611,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 
min, s32 max, s32 ste
        case V4L2_CID_CAMERA_CLASS:
        case V4L2_CID_MPEG_CLASS:
        case V4L2_CID_FM_TX_CLASS:
+       case V4L2_CID_FM_RX_CLASS:
                qctrl->type = V4L2_CTRL_TYPE_CTRL_CLASS;
                qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
                min = max = step = def = 0;
-- 
1.5.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to