From nobody Sat May 18 13:16:30 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3D50C54EBD for ; Tue, 3 Jan 2023 11:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237462AbjACLCM (ORCPT ); Tue, 3 Jan 2023 06:02:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237168AbjACLB4 (ORCPT ); Tue, 3 Jan 2023 06:01:56 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9ED6110D9 for ; Tue, 3 Jan 2023 03:01:55 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id m18so72609164eji.5 for ; Tue, 03 Jan 2023 03:01:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Co9IVvG+/S6WvoqX0pBLNaNrTdqsJyhBz/38h+pUNcQ=; b=PNXXFXIq+faqpY2Liq7EY/E7M78Zi+NAF2s5xp+2bI1depV/ZFGgtfGg3DaeAmlK2w 77aqj/inIHQokfyHkn1PvhTYD4WQuxdkQKud4EUbOQlrBPpp70eenxPZnumWgnNbeyHK NfeGLIwhNoGllFYDPc/UDKAG/gCrb0NsNCir4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Co9IVvG+/S6WvoqX0pBLNaNrTdqsJyhBz/38h+pUNcQ=; b=MQQnlHWZoOe0uD+HwEXG0evbMagzMcbv+Rz/qQE/KS3/NHouDZLX5hbIwbreVIK3Q8 M/Gno3hNuyimNCkpbBj2+HchQfUnDnyyAdGhPQR0Oo4fRZZaurouM0jTIcjYEXVDViZa UZUL5DguIjwY9KHRmCRCDJUxoeKYEGJoBPqjYJmN4/sMTC3wgk1HvpZsSfyP2MqTXrUI h8XJXXKMAzQ+/23MxxcvV4iE2vAlCJchEa2r/A+8qwcyNlDIML/shwi7xQgWBff11Peo mftl/w5J7WS1CRw+g/U5qqqNSxoonbRK09emmEcUDpYiFRef1JnurtgyjZzSeEI8ZGsf BIXw== X-Gm-Message-State: AFqh2koeE/WMNwCaWAFVBSi3xJZpwDMnT6Z4ONw8AikLgeClxYVXxwUU hmyHgFi/5+F1PVlNmACmx4qzdbJOxXt9OCQ13+c= X-Google-Smtp-Source: AMrXdXuFHS3L/k5nrZ5ec5hc//xVb2JMLvmw84nYYasWMhxgx8Fkj5YlZAzRCWmEl4kL3LBVdlT16w== X-Received: by 2002:a17:907:6e16:b0:7e0:eed0:8beb with SMTP id sd22-20020a1709076e1600b007e0eed08bebmr50674638ejc.41.1672743714098; Tue, 03 Jan 2023 03:01:54 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:ef23:1430:9acc:b68]) by smtp.gmail.com with ESMTPSA id l12-20020a17090615cc00b007c0cd272a06sm13944331ejd.225.2023.01.03.03.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 03:01:53 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Jan 2023 12:01:21 +0100 Subject: [PATCH v3 1/3] media: uvcvideo: Limit power line control for Acer EasyCamera MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20221101-easycam-v3-1-2c9881a7a4f7@chromium.org> References: <20221101-easycam-v3-0-2c9881a7a4f7@chromium.org> In-Reply-To: <20221101-easycam-v3-0-2c9881a7a4f7@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Ricardo Ribalda , linux-kernel@vger.kernel.org, Sergey Senozhatsky X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=1859; i=ribalda@chromium.org; h=from:subject:message-id; bh=rO1fkJL8+8p1iNyVTD4jSQz4HIqEXb4KMbzC4AEwi/0=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjtAsZuAFlyAU0OVj1MY8bdt/khTMDCzwe3OKTs8DM bi51/RSJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY7QLGQAKCRDRN9E+zzrEiM8gD/ 9/PDhrsZcm4p8YEssdUzKS1CTASCQ6oDA6Je7r2pDnjab0mpapPCh1Gur5rqkAMGtSkiMHQhYMblWZ Ic/HIIWaQgEoQaY/K++MqsT+D8pvG0G/BEa0JZaSQ2btZBw1va2+znLxCuet8juawAAGCiho1ZaW1l x5QvEmNlXtrfC/0RJkThtbZ2tqq1Me+ZGEhy9Qv5KhqXUezod2pcYX4QrthCW/Lo0XnBuOCNgH/Al6 pUbqA658hjtsmeEFEzZEQw8d3CGDDlwbzfLDJh1w3cwDcu7dZIvxrXQ6aqCyCRLGdRcFd2E2z8WOmm bSselOPrt4FsONFb8r5W7BfWLIY5WsQTkfDnLIG+DBV3NvFA3+QOLvyXCND8eODA7gdWUEc4Ir6zP3 hA0TA9ZzAwLSBy8PQP0r1Yxe/zFFNawesdyFDOAnT5rJF8nGbs0/NuAkBflf8lkLS8pGnSAEGN8U+Y HI/rnLFDLXhmezNbdK6mXbNbrzcYT6x+PM48P2FaixjZOhgJGf5Aef22geEBomVmOy3vnLtCUvqXv4 J3hxP1y0t9QJL70J077umXvdQTOO1N3EZlQ96rnQnq+e9j0H/6cKh1+DX1eafOYvKJlngsmv4t43iH 7Yv6DQD0bS53NCtDuffsDRX5FcPefJsUOpIvckQq1UpQpSvmWpjh8rV+vRkg== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device does not implement the power line control correctly. Add a corresponding control mapping override. Bus 003 Device 002: ID 5986:1180 Acer, Inc EasyCamera Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 idVendor 0x5986 Acer, Inc idProduct 0x1180 bcdDevice 56.04 iManufacturer 3 Bison iProduct 1 EasyCamera iSerial 2 bNumConfigurations 1 Reviewed-by: Sergey Senozhatsky Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index e4bcb5011360..f2abd9d0c717 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2991,6 +2991,15 @@ static const struct usb_device_id uvc_ids[] =3D { .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D (kernel_ulong_t)&uvc_ctrl_power_line_limited }, + /* Acer EasyCamera */ + { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor =3D 0x5986, + .idProduct =3D 0x1180, + .bInterfaceClass =3D USB_CLASS_VIDEO, + .bInterfaceSubClass =3D 1, + .bInterfaceProtocol =3D 0, + .driver_info =3D (kernel_ulong_t)&uvc_ctrl_power_line_limited }, /* Intel RealSense D4M */ { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, --=20 2.39.0.314.g84b9a713c41-goog-b4-0.11.0-dev-696ae From nobody Sat May 18 13:16:30 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7145FC3DA7D for ; Tue, 3 Jan 2023 11:02:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237473AbjACLCU (ORCPT ); Tue, 3 Jan 2023 06:02:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237254AbjACLB5 (ORCPT ); Tue, 3 Jan 2023 06:01:57 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACD82B84 for ; Tue, 3 Jan 2023 03:01:56 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id ud5so72750612ejc.4 for ; Tue, 03 Jan 2023 03:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oLHiG2/HZCrES/DrgZpQvyLSgThQWWZsxAbqNPZVrVE=; b=CEEm3P2LtIOATwjZmOZkyiYIqCJW9YqXW6w03C8/UCOaxmvQi/pQj33Xnh+N4hlrqn /CmqjsTp0Bz5yU1v6t18xkZ4YbJJCY1+RBZZQViBmzylM0PoqLhvJo+MZM23Qf3jtMpW 1EJyg1fvu6xoRcm5SOXaQUTfbti0KNnIgh108= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oLHiG2/HZCrES/DrgZpQvyLSgThQWWZsxAbqNPZVrVE=; b=G1xL0Y4xqtkXtWtbOEThDxSx7HSo5dvdGe7OMX5/vVftWUrFlSQobnWs6nTFi/ZuhY p8GksL8pf1lFA/GLQkKlEWgX+9kd7x8L6eAb54hMSdLxzdTYuhvL5xSP2uUg32IY+YYD JhI4Ctkmo2Dlx+jr4SU7/S7YYJ41rAfwVEX4tSyNwSDskHZyegAIvZs2h/CGNgA3w8pc ozqohHTEM16kx3ursyOPrMhvYZlEzVksOoLAvAv2AeYwvNEH0hPjz3kBOaL0fN/LCL7W RqjvBuAjandrIUXfbf3619Xrbz8eTfmbrXIk1LNHG5YQh9iJZvvbj6cciOa4Sw4NpauS jrvA== X-Gm-Message-State: AFqh2kr2gMShXcRbz5A4Fgffo7myJfuniYW2ZvDm6Owcc+w70yXHwGQ5 48NLywUhITIMwo+wZ34mbG8+qXVM/pOp652Ixdw= X-Google-Smtp-Source: AMrXdXuQ0J3Zyl6G6NA6CivX+WLL2ToUZ3Xio5SZmEMjhznXpQIHay2XYS6hZdSgwdm4NdSwq/9wWg== X-Received: by 2002:a17:906:8a58:b0:7c1:6981:d062 with SMTP id gx24-20020a1709068a5800b007c16981d062mr38343338ejc.72.1672743715095; Tue, 03 Jan 2023 03:01:55 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:ef23:1430:9acc:b68]) by smtp.gmail.com with ESMTPSA id l12-20020a17090615cc00b007c0cd272a06sm13944331ejd.225.2023.01.03.03.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 03:01:54 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Jan 2023 12:01:22 +0100 Subject: [PATCH v3 2/3] media: uvcvideo: Fix power line control for Lenovo Integrated Camera MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20221101-easycam-v3-2-2c9881a7a4f7@chromium.org> References: <20221101-easycam-v3-0-2c9881a7a4f7@chromium.org> In-Reply-To: <20221101-easycam-v3-0-2c9881a7a4f7@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Ricardo Ribalda , linux-kernel@vger.kernel.org, Sergey Senozhatsky X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=4320; i=ribalda@chromium.org; h=from:subject:message-id; bh=aVaHYg3fgCdhxZASYM8cTLyzA416I2c/ZaUb71RRnqw=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjtAsbudZAvvY0e2cnZ4mS9Nw0UE7sLMQulDaoLqtH vwNuXSaJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY7QLGwAKCRDRN9E+zzrEiOQ5D/ 9/QtPLeDQ/64Xi0sCu9rrTnf0fQz4ST0OwuHblALX37OG1S8cbn4M44DyhmCDYgch5jEl9oqkWJ7cF cbiAK/M5P563+slzAcfWocrg20GAffefszR4AimaUOy5EEox1vElV4KkzGB62VZPBSUOsc5fSuQaMI 6HcUHGe86v0tQ1eVmGxA0o3XfjY0pddw/bbOYRAdf4301R3ORXQRY/s9Pd1fCcPYtsIF6BPEOPQt93 2vTxot/iAgTL5YxZZmjX9gI+6YZxpD1zmtnOuae89goXd60YZVDqJFwQ2gLtzxLqFskCZCJGYkvywj mDu+c6tcud6Ur+1A1I+YUZYrQ5TdXJa6SBR6HRNYIKgCIKXV9Q9uvGu4qWSPSRVwJ5lOaSMF9+qKna XDyaYvgZzWE1CXlg7AMK8eFCUxV2UsAVfa+CbLgo29pgg8xwABcF52LZJ8ncnE6v5IFMpPFlTR7fJY 7XmrANynp0a7j6t2X4hbrnNT76ioQE9XsPDUzY2fpSJnfjGNaL90cecSBO8lGu5l5SNWtnnpeh3/Ff /baD6GcGXSN8WCNPDbkkOG6JS9H0W8v7eK7YHnjmos3PpNxMP7bniFdPiQIg2Az7xknBjkksMlKfCL /fJB81iOUUEisXmnBELWgkFAY+qkQ3ZotKczH+yN5qMWV5Rh5Ma4lBKJKJ5A== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device does not implement the power line control correctly. It is a UVC 1.5 device, but implements the PLC control as a UVC 1.1 device. Add the corresponding control mapping override. Bus 003 Device 002: ID 30c9:0093 Lenovo Integrated Camera Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.01 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 idVendor 0x30c9 idProduct 0x0093 bcdDevice 0.07 iManufacturer 3 Lenovo iProduct 1 Integrated Camera iSerial 2 8SSC21J75356V1SR2830069 bNumConfigurations 1 Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 24 +++++++++++++----------- drivers/media/usb/uvc/uvc_driver.c | 16 ++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index c95a2229f4fa..d8283d71bc96 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -721,18 +721,20 @@ static const struct uvc_control_mapping uvc_ctrl_mapp= ings[] =3D { }, }; =20 +const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11 =3D { + .id =3D V4L2_CID_POWER_LINE_FREQUENCY, + .entity =3D UVC_GUID_UVC_PROCESSING, + .selector =3D UVC_PU_POWER_LINE_FREQUENCY_CONTROL, + .size =3D 2, + .offset =3D 0, + .v4l2_type =3D V4L2_CTRL_TYPE_MENU, + .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, + .menu_info =3D power_line_frequency_controls, + .menu_count =3D ARRAY_SIZE(power_line_frequency_controls) - 1, +}; + static const struct uvc_control_mapping uvc_ctrl_mappings_uvc11[] =3D { - { - .id =3D V4L2_CID_POWER_LINE_FREQUENCY, - .entity =3D UVC_GUID_UVC_PROCESSING, - .selector =3D UVC_PU_POWER_LINE_FREQUENCY_CONTROL, - .size =3D 2, - .offset =3D 0, - .v4l2_type =3D V4L2_CTRL_TYPE_MENU, - .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, - .menu_info =3D power_line_frequency_controls, - .menu_count =3D ARRAY_SIZE(power_line_frequency_controls) - 1, - }, + uvc_ctrl_power_line_mapping_uvc11, }; =20 static const struct uvc_control_mapping uvc_ctrl_mappings_uvc15[] =3D { diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index f2abd9d0c717..9c09bc988278 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2370,6 +2370,13 @@ MODULE_PARM_DESC(timeout, "Streaming control request= s timeout"); * Driver initialization and cleanup */ =20 +static const struct uvc_device_info uvc_ctrl_power_line_uvc11 =3D { + .mappings =3D (const struct uvc_control_mapping *[]) { + &uvc_ctrl_power_line_mapping_uvc11, + NULL, /* Sentinel */ + }, +}; + static const struct uvc_menu_info power_line_frequency_controls_limited[] = =3D { { 1, "50 Hz" }, { 2, "60 Hz" }, @@ -2973,6 +2980,15 @@ static const struct usb_device_id uvc_ids[] =3D { .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_FORCE_BPP) }, + /* Lenovo Integrated Camera */ + { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor =3D 0x30c9, + .idProduct =3D 0x0093, + .bInterfaceClass =3D USB_CLASS_VIDEO, + .bInterfaceSubClass =3D 1, + .bInterfaceProtocol =3D UVC_PC_PROTOCOL_15, + .driver_info =3D (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 }, /* Sonix Technology USB 2.0 Camera */ { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index df93db259312..bcb0b0c101c8 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -728,6 +728,7 @@ int uvc_status_start(struct uvc_device *dev, gfp_t flag= s); void uvc_status_stop(struct uvc_device *dev); =20 /* Controls */ +extern const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11; extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops; =20 int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, --=20 2.39.0.314.g84b9a713c41-goog-b4-0.11.0-dev-696ae From nobody Sat May 18 13:16:30 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C80DEC54EBF for ; Tue, 3 Jan 2023 11:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237467AbjACLCP (ORCPT ); Tue, 3 Jan 2023 06:02:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237285AbjACLB6 (ORCPT ); Tue, 3 Jan 2023 06:01:58 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FF9110D9 for ; Tue, 3 Jan 2023 03:01:57 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id fy8so8771344ejc.13 for ; Tue, 03 Jan 2023 03:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=00bD41CpohMBMgWN2aRl98+MG1NWyw9aXdRxmbyLX7k=; b=lkh5HCyhJ0VSthqIJhVg7LcOAC5++DcCafGeW+njz7gDkKybj2yDo9MQKVo5UXRT6G MILYofG4/Z6AMJSCIsZToHVaDBomPh1H6siahu7wUBPJpaihWnRtYYNnsM20RVRiDtUW n2CZfMi+KUMjSk8bwX2x5599R1zGl7KIARf58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=00bD41CpohMBMgWN2aRl98+MG1NWyw9aXdRxmbyLX7k=; b=NbLm5U2VH1E+4C/4yUnxXmr7bPBQtsOgKyYqGsAtP5/8ylvkV0IUOjQT5Qj0RDRpVW hQl2z//lnrnEziWeiOohiXuT4lecXIdL/qwT1smYvOhqg7oOPvOv0mbBowBQJrK/L5Bk KVzbejllbh+L3nkiXChccXERTW7LraJk2Hd5GyPRLrIgNPROhMX/rqsWi7x96PG/RMzH nqEzr8ezE1v2wFquUSFlfhy20TnnOifMVxLvgU20ApssnJQs1uul8A9bm3pGXsHKN3y0 ZcXjIcpq2s7MxBxbf8ROHRCmxRtbve0WsAOACe5OkiNRAteJOn789Lw4nKwJ1jNPSwRY ORug== X-Gm-Message-State: AFqh2kpTxWdtBZ4FlTiHoMSNxfHIReCK2DZdnnexVKpSg2ue5RxdYy5N D7B/cuEt2VT3onS+YinqsMJ4pNalgf8j8LBP9Vk= X-Google-Smtp-Source: AMrXdXulMSINEtzbSpMB3sr1ndMTGYRfhkV9njBGjb65OWUwvaklRjeHlms0gQxxrbKdq99S/2IKSQ== X-Received: by 2002:a17:907:8e93:b0:7ae:bfec:74c7 with SMTP id tx19-20020a1709078e9300b007aebfec74c7mr39110590ejc.72.1672743715986; Tue, 03 Jan 2023 03:01:55 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:ef23:1430:9acc:b68]) by smtp.gmail.com with ESMTPSA id l12-20020a17090615cc00b007c0cd272a06sm13944331ejd.225.2023.01.03.03.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 03:01:55 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Jan 2023 12:01:23 +0100 Subject: [PATCH v3 3/3] media: uvcvideo: Refactor power_line_frequency_controls_limited MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20221101-easycam-v3-3-2c9881a7a4f7@chromium.org> References: <20221101-easycam-v3-0-2c9881a7a4f7@chromium.org> In-Reply-To: <20221101-easycam-v3-0-2c9881a7a4f7@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Ricardo Ribalda , linux-kernel@vger.kernel.org, Sergey Senozhatsky X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=3328; i=ribalda@chromium.org; h=from:subject:message-id; bh=U6+fv6Oz+oBYLUlCti95XpzN5zRXjjLpaYFVN2dc0HI=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjtAsep6BRBKmLrGo7Jh0JjciKXjPQr18hFu57TlyO Go95FN+JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY7QLHgAKCRDRN9E+zzrEiDfTD/ sED2E32h08CttZhf7ECpbeysdAs4/o8+xOE0p0bCSKi5Tjk2X2z7qHE6CGs1mKFD6sXh4bArM/yatP 2eBzUH3JooZyZI0ZKYqrm8ZPsvYEDrLYYeErHU1D1McJsSoOUeKFLrLU+/VjfRthUB5Jd2mERmJkmv FONN68J9MWdIJO5P9rZk6qYWpxBBG+FULClMaf6xc3PkpM9CXMeBeInUC1uCveQ39M/rjjaA9zSrud gkhBFDxf8qBPZZ0v6u3l652X8k+++DLdW2Hu4J+i9iod7zaTHMesogtkzYXktqNEXE1oLM2Eb8aVxx n3KohB6dLJO4hVHryA/Ls3ML9zmQjBi/snepflN5/LTFbH0afItxxc4mEqMzGrr6C63Jfc9A7R9TAQ QJY5nSUiq/58UfWCbB6qdR9D2SKhxUAxK0ix4AUpvZgQw1BImKLtV/g4ix+O7i71hd0oJXVGa2dmXo OHGaHnTqnllCnUAT5FHVVeTB+KeF2UtdCUdlECRn7sqGTInQxqD785P17/IE3uquCIg4w1FWRxXmLO 63Ofnn8KevPELj3tOXP3H/a5gYXVR+Q9W91eIIh7P1GHnhHO9y9DcoSDgqVjDG06iINKWHARnY7+iw v8eoVUMyQ3sf4YqcAHBAW0xD0Rtldqn91Jm1pv3C6NLexP2bckaidYSwAXWQ== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the control mapping to uvc_ctrl.c. This way we do not have references to uvc controls or v4l2 controls in uvc_driver.c Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 17 +++++++++++++++++ drivers/media/usb/uvc/uvc_driver.c | 17 ----------------- drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index d8283d71bc96..4ff0415d8bf4 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -370,6 +370,11 @@ static const struct uvc_menu_info power_line_frequency= _controls[] =3D { { 3, "Auto" }, }; =20 +static const struct uvc_menu_info power_line_frequency_controls_limited[] = =3D { + { 1, "50 Hz" }, + { 2, "60 Hz" }, +}; + static const struct uvc_menu_info exposure_auto_controls[] =3D { { 2, "Auto Mode" }, { 1, "Manual Mode" }, @@ -751,6 +756,18 @@ static const struct uvc_control_mapping uvc_ctrl_mappi= ngs_uvc15[] =3D { }, }; =20 +const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited =3D { + .id =3D V4L2_CID_POWER_LINE_FREQUENCY, + .entity =3D UVC_GUID_UVC_PROCESSING, + .selector =3D UVC_PU_POWER_LINE_FREQUENCY_CONTROL, + .size =3D 2, + .offset =3D 0, + .v4l2_type =3D V4L2_CTRL_TYPE_MENU, + .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, + .menu_info =3D power_line_frequency_controls_limited, + .menu_count =3D ARRAY_SIZE(power_line_frequency_controls_limited), +}; + /* ------------------------------------------------------------------------ * Utility functions */ diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 9c09bc988278..6531aed5d642 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2377,23 +2377,6 @@ static const struct uvc_device_info uvc_ctrl_power_l= ine_uvc11 =3D { }, }; =20 -static const struct uvc_menu_info power_line_frequency_controls_limited[] = =3D { - { 1, "50 Hz" }, - { 2, "60 Hz" }, -}; - -static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limite= d =3D { - .id =3D V4L2_CID_POWER_LINE_FREQUENCY, - .entity =3D UVC_GUID_UVC_PROCESSING, - .selector =3D UVC_PU_POWER_LINE_FREQUENCY_CONTROL, - .size =3D 2, - .offset =3D 0, - .v4l2_type =3D V4L2_CTRL_TYPE_MENU, - .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, - .menu_info =3D power_line_frequency_controls_limited, - .menu_count =3D ARRAY_SIZE(power_line_frequency_controls_limited), -}; - static const struct uvc_device_info uvc_ctrl_power_line_limited =3D { .mappings =3D (const struct uvc_control_mapping *[]) { &uvc_ctrl_power_line_mapping_limited, diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index bcb0b0c101c8..818ae7a6f9b9 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -728,6 +728,7 @@ int uvc_status_start(struct uvc_device *dev, gfp_t flag= s); void uvc_status_stop(struct uvc_device *dev); =20 /* Controls */ +extern const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limite= d; extern const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11; extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops; =20 --=20 2.39.0.314.g84b9a713c41-goog-b4-0.11.0-dev-696ae