aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2015-10-10 12:50:58 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-10-20 13:37:56 -0400
commit41018cb84a9ed440db1508d67d9dd4084d5460eb (patch)
tree5b4e1d6fed8e1a89db3c49971d2d2a0c33c9f46d
parentf3c3ecec97c24cf0e53bb61ee85698acc00bcd68 (diff)
[media] v4l2: add RF gain control
Add new RF tuner gain control named RF Gain. That is aimed for first amplifier chip right after antenna connector. There is existing LNA Gain control, which is quite same, but it is aimed for cases amplifier is integrated to tuner chip. Some designs have both, as almost all recent tuner silicons has integrated LNA/RF amplifier in any case. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/v4l2-core/v4l2-ctrls.c2
-rw-r--r--include/uapi/linux/v4l2-controls.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 44521a9da66d..a89b94601b90 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -888,6 +888,7 @@ const char *v4l2_ctrl_get_name(u32 id)
888 case V4L2_CID_TUNE_DEEMPHASIS: return "De-Emphasis"; 888 case V4L2_CID_TUNE_DEEMPHASIS: return "De-Emphasis";
889 case V4L2_CID_RDS_RECEPTION: return "RDS Reception"; 889 case V4L2_CID_RDS_RECEPTION: return "RDS Reception";
890 case V4L2_CID_RF_TUNER_CLASS: return "RF Tuner Controls"; 890 case V4L2_CID_RF_TUNER_CLASS: return "RF Tuner Controls";
891 case V4L2_CID_RF_TUNER_RF_GAIN: return "RF Gain";
891 case V4L2_CID_RF_TUNER_LNA_GAIN_AUTO: return "LNA Gain, Auto"; 892 case V4L2_CID_RF_TUNER_LNA_GAIN_AUTO: return "LNA Gain, Auto";
892 case V4L2_CID_RF_TUNER_LNA_GAIN: return "LNA Gain"; 893 case V4L2_CID_RF_TUNER_LNA_GAIN: return "LNA Gain";
893 case V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO: return "Mixer Gain, Auto"; 894 case V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO: return "Mixer Gain, Auto";
@@ -1161,6 +1162,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
1161 case V4L2_CID_PILOT_TONE_FREQUENCY: 1162 case V4L2_CID_PILOT_TONE_FREQUENCY:
1162 case V4L2_CID_TUNE_POWER_LEVEL: 1163 case V4L2_CID_TUNE_POWER_LEVEL:
1163 case V4L2_CID_TUNE_ANTENNA_CAPACITOR: 1164 case V4L2_CID_TUNE_ANTENNA_CAPACITOR:
1165 case V4L2_CID_RF_TUNER_RF_GAIN:
1164 case V4L2_CID_RF_TUNER_LNA_GAIN: 1166 case V4L2_CID_RF_TUNER_LNA_GAIN:
1165 case V4L2_CID_RF_TUNER_MIXER_GAIN: 1167 case V4L2_CID_RF_TUNER_MIXER_GAIN:
1166 case V4L2_CID_RF_TUNER_IF_GAIN: 1168 case V4L2_CID_RF_TUNER_IF_GAIN:
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index d448c536b49d..1bdce501ad6b 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -936,6 +936,7 @@ enum v4l2_deemphasis {
936 936
937#define V4L2_CID_RF_TUNER_BANDWIDTH_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 11) 937#define V4L2_CID_RF_TUNER_BANDWIDTH_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 11)
938#define V4L2_CID_RF_TUNER_BANDWIDTH (V4L2_CID_RF_TUNER_CLASS_BASE + 12) 938#define V4L2_CID_RF_TUNER_BANDWIDTH (V4L2_CID_RF_TUNER_CLASS_BASE + 12)
939#define V4L2_CID_RF_TUNER_RF_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 32)
939#define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 41) 940#define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 41)
940#define V4L2_CID_RF_TUNER_LNA_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 42) 941#define V4L2_CID_RF_TUNER_LNA_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 42)
941#define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 51) 942#define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 51)