Merge topic branch 'cg2900-fm' into integration-linux-ux500-3.3

1 files changed, 58 insertions, 0 deletions

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 5e11f8a1f86..1db39e15a1a 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1629,6 +1629,64 @@ enum v4l2_mpeg_mfc51_video_force_frame_type {
 #define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC		(V4L2_CID_MPEG_MFC51_BASE+53)
 #define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P		(V4L2_CID_MPEG_MFC51_BASE+54)
 
+/*  Private Base control IDs specific to the CG2900 FM driver as defined by V4L2 */
+#define V4L2_CID_CG2900_RADIO_PRIVATE_BASE  (V4L2_CID_PRIVATE_BASE | 0x1000)
+#define V4L2_CID_CG2900_RADIO_BANDSCAN  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+1)
+enum v4l2_cg2900_radio_bandscan {
+	V4L2_CG2900_RADIO_BANDSCAN_START    = 0,
+	V4L2_CG2900_RADIO_BANDSCAN_STOP      = 1,
+};
+#define V4L2_CID_CG2900_RADIO_BANDSCAN_GET_RESULTS (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+2)
+#define V4L2_CID_CG2900_RADIO_BLOCKSCAN_START (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+3)
+#define V4L2_CID_CG2900_RADIO_BLOCKSCAN_GET_RESULTS (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+4)
+#define V4L2_CID_CG2900_RADIO_CHIP_STATE (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+5)
+enum v4l2_cg2900_radio_chip_state {
+	V4L2_CG2900_RADIO_STANDBY      = 0,
+	V4L2_CG2900_RADIO_POWERUP      = 1,
+};
+#define V4L2_CID_CG2900_RADIO_RSSI_THRESHOLD  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+6)
+#define V4L2_CID_CG2900_RADIO_SELECT_ANTENNA  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+7)
+enum v4l2_cg2900_radio_select_antenna {
+	V4L2_CG2900_RADIO_EMBEDDED_ANTENNA	= 0,
+	V4L2_CG2900_RADIO_WIRED_ANTENNA		= 1,
+};
+#define V4L2_CID_CG2900_RADIO_RDS_AF_UPDATE_START  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+8)
+#define V4L2_CID_CG2900_RADIO_RDS_AF_UPDATE_GET_RESULT  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+9)
+#define V4L2_CID_CG2900_RADIO_RDS_AF_SWITCH_START  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+10)
+#define V4L2_CID_CG2900_RADIO_RDS_AF_SWITCH_GET_RESULT  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+11)
+#define V4L2_CID_CG2900_RADIO_TEST_TONE_GENERATOR_SET_STATUS	(V4L2_CID_CG2900_RADIO_PRIVATE_BASE+12)
+enum v4l2_cg2900_radio_test_tone_generator_set_status {
+	V4L2_CG2900_RADIO_TEST_TONE_GEN_OFF	= 0,
+	V4L2_CG2900_RADIO_TEST_TONE_GEN_ON_W_SRC		= 1,
+	V4L2_CG2900_RADIO_TEST_TONE_GENERATOR_ON_WO_SRC	= 2,
+};
+#define V4L2_CID_CG2900_RADIO_TEST_TONE_CONNECT		(V4L2_CID_CG2900_RADIO_PRIVATE_BASE+13)
+enum v4l2_cg2900_radio_test_tone_generator {
+	V4L2_CG2900_RADIO_TEST_TONE_NORMAL_AUDIO	= 0,
+	V4L2_CG2900_RADIO_TEST_TONE_ZERO		= 1,
+	V4L2_CG2900_RADIO_TEST_TONE_TONE_1 = 2,
+	V4L2_CG2900_RADIO_TEST_TONE_TONE_2 = 3,
+	V4L2_CG2900_RADIO_TEST_TONE_TONE_SUM = 4,
+};
+#define V4L2_CID_CG2900_RADIO_TEST_TONE_SET_PARAMS	(V4L2_CID_CG2900_RADIO_PRIVATE_BASE+14)
+#define V4L2_CID_CG2900_RADIO_TUNE_DEEMPHASIS		(V4L2_CID_CG2900_RADIO_PRIVATE_BASE+15)
+enum v4l2_cg2900_radio_deemphasis {
+	V4L2_CG2900_RADIO_DEEMPHASIS_DISABLED	= 0,
+	V4L2_CG2900_RADIO_DEEMPHASIS_50_uS	= 1,
+	V4L2_CG2900_RADIO_DEEMPHASIS_75_uS	= 2,
+};
+#define V4L2_CID_CG2900_RADIO_GET_INTERRUPT  (V4L2_CID_CG2900_RADIO_PRIVATE_BASE+16)
+enum v4l2_cg2900_radio_interrupt {
+	V4L2_CG2900_RADIO_INTERRUPT_UNKNOWN			= 0,
+	V4L2_CG2900_RADIO_INTERRUPT_SEARCH_COMPLETED	= 1,
+	V4L2_CG2900_RADIO_INTERRUPT_BAND_SCAN_COMPLETED	= 2,
+	V4L2_CG2900_RADIO_INTERRUPT_BLOCK_SCAN_COMPLETED	= 3,
+	V4L2_CG2900_RADIO_INTERRUPT_SCAN_CANCELLED	= 4,
+	V4L2_CG2900_RADIO_INTERRUPT_MONO_STEREO_TRANSITION	= 5,
+	V4L2_CG2900_RADIO_INTERRUPT_DEVICE_RESET	= 6,
+	V4L2_CG2900_RADIO_INTERRUPT_RDS_RECEIVED	= 7
+};
+
 /*  Camera class control IDs */
 #define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
 #define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)