[PATCH 2/4] media: uvcvideo: Add UVC_QUIRK_LIMITED_POWERLINE

From: Ricardo Ribalda
Date: Thu May 19 2022 - 11:43:37 EST


Add a quirk for devices that only support a limited set of Power Line
frequencies.

Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
---
drivers/media/usb/uvc/uvc_ctrl.c | 27 +++++++++++++++++++++++++++
drivers/media/usb/uvc/uvcvideo.h | 1 +
2 files changed, 28 insertions(+)

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 13cad4aa7573..ffa103789ef9 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -369,6 +369,11 @@ static const struct uvc_menu_info power_line_frequency_controls[] = {
{ 3, "Auto" },
};

+static const struct uvc_menu_info power_line_frequency_controls_limited[] = {
+ { 1, "50 Hz" },
+ { 2, "60 Hz" },
+};
+
static const struct uvc_menu_info exposure_auto_controls[] = {
{ 2, "Auto Mode" },
{ 1, "Manual Mode" },
@@ -731,6 +736,19 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = {
},
};

+static const
+struct uvc_control_mapping power_line_mapping_limited = {
+ .id = V4L2_CID_POWER_LINE_FREQUENCY,
+ .entity = UVC_GUID_UVC_PROCESSING,
+ .selector = UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
+ .size = 2,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_MENU,
+ .data_type = UVC_CTRL_DATA_TYPE_ENUM,
+ .menu_info = power_line_frequency_controls_limited,
+ .menu_count = ARRAY_SIZE(power_line_frequency_controls_limited),
+};
+
/* ------------------------------------------------------------------------
* Utility functions
*/
@@ -2406,6 +2424,15 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
if (!ctrl->initialized)
return;

+ if (chain->dev->quirks & UVC_QUIRK_LIMITED_POWERLINE &&
+ ctrl->info.selector == power_line_mapping_limited.selector &&
+ uvc_entity_match_guid(ctrl->entity,
+ power_line_mapping_limited.entity)) {
+ __uvc_ctrl_add_mapping(chain, ctrl,
+ &power_line_mapping_limited);
+ return;
+ }
+
for (; mapping < mend; ++mapping) {
if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
ctrl->info.selector == mapping->selector)
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 143230b3275b..06779eb4f5fa 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -209,6 +209,7 @@
#define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400
#define UVC_QUIRK_FORCE_Y8 0x00000800
#define UVC_QUIRK_FORCE_BPP 0x00001000
+#define UVC_QUIRK_LIMITED_POWERLINE 0x00002000

/* Format flags */
#define UVC_FMT_FLAG_COMPRESSED 0x00000001
--
2.36.1.124.g0e6072fb45-goog