From patchwork Thu Jan 5 13:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 3621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp311234wrt; Thu, 5 Jan 2023 05:56:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXvXwKWDwddux/FaOZ30CqH+8h5dESt9OIhq+xTUUJ5TQJ5aAvobqoe46qtJGUcmk/J+U7rA X-Received: by 2002:a17:907:1c9a:b0:7c1:2f05:7fd6 with SMTP id nb26-20020a1709071c9a00b007c12f057fd6mr49110702ejc.39.1672927017322; Thu, 05 Jan 2023 05:56:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672927017; cv=none; d=google.com; s=arc-20160816; b=YXDRwk3PDisuaz2LohV4HDrwDEvOoa4CIVuNKGtQC0nEYSEkWNsOfYvJPrftznv6vy zpI1SrpQ6T8GGnbYXfnNq/xHFh2uQ3jMaf7MBYEfK/23RZ0LbatcApuf68FEE+qtrdq4 1G1CkB5pk3INYfudyN5vce9nk6E3EGcJyH9q6tbb+1S29jntKtiMrk9uo3JW8wimI+c4 QI9dwzMVg8mIrnl5P3FVmYJ8BrZjHd5NIFoe0wQ5iQTyiQoPSf60LMBA5CqZtfPlAgR9 De8ioiD8tTKchTTfCMrpbwiJmG1Q81cRGmrrLZRyd002uyOZzQjc168iiovcCuLpi4gS HaUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:date:from :content-transfer-encoding:mime-version:subject:dkim-signature; bh=tH78Rn4lJLon0a4zVOfsUWs2I5WirZwta6cE5VpPqGI=; b=bKs3zoeaoDk4xlRlqfoVxnqAjszmquOz38dM0gQyFuRmCVqLUPSMrUa/f9qXVYXQ/c azQV5gAHMwSkuBKwMbsRlWgNKAkomFLCXTOUDbkH31GDXSf6wlokpyQzq70jDTc8F8gJ ywL37IdBq9kqOeMaeUh4yBEw7eQi5HfGMGDaR7SzgOnwVghSWUEzDJvW0bDLm5ks34Ck xAlCIKtqeo9TtVPkKXwzIsvkkSnUP3vt1IgTS87+57Ge6TjqbntCv9ueEKGyesl/kHTg QhT+74wWaPbkS13p7yK1ZaubSS9BnNMPYOhMAA8iRLOqJ0ImHCzZvanmd0uPhDlu65Ag l2ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=f+486Ewn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xf13-20020a17090731cd00b007c11812c621si30264160ejb.459.2023.01.05.05.56.31; Thu, 05 Jan 2023 05:56:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=f+486Ewn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234222AbjAEN4I (ORCPT + 99 others); Thu, 5 Jan 2023 08:56:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234496AbjAENzV (ORCPT ); Thu, 5 Jan 2023 08:55:21 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 341724E414 for ; Thu, 5 Jan 2023 05:53:16 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id fc4so90114648ejc.12 for ; Thu, 05 Jan 2023 05:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:message-id:date:from:content-transfer-encoding:mime-version :subject:from:to:cc:subject:date:message-id:reply-to; bh=tH78Rn4lJLon0a4zVOfsUWs2I5WirZwta6cE5VpPqGI=; b=f+486Ewn715r5VIXdUbCitdYnog0wqCfCAOSLnxf/uTbE2RQdsPOkAoFcRTCWTkXfC PAwl6z+lFxxMwfuS+y8sYQmDFcRQ38CA2vg3xJQYouCBVKexrYRXq5ZqazQrGbFgn1JB ZSIVDzjNptueaZ7bCi+44PYeZ/wSW92DmEjhs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:message-id:date:from:content-transfer-encoding:mime-version :subject:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tH78Rn4lJLon0a4zVOfsUWs2I5WirZwta6cE5VpPqGI=; b=0AYuwZJcT9HjRHxIe8sQJ7Iuy6gUw2CcvL4xZbjz3Ds6ZZ1mqgRWgVGOHJls5P30jQ kNURsxqEqjY8TSpI79DUAUXbkSp5Samnu9oHeNNtxpkOlsEvoinkUybQ+S/W3Wp68HNL tzJrTw7qYOh3ygNXYJCfl8yRkgncxZx3EuMSMciAdUoR6aUgWzs3xK7PNCO+QWLzPZ4u MEqYp+DBsEzU64s//XlZLySUGE44SvJj1WdwQeIxGzDxDMtNQrEoSxc0zn6ATdSMW8IJ L7JIzYxDuRX6sPZgFZYZ3lIwBcmtN6ws2E+s9a+WBSU5y2ORYASEkZhdxDg6dyscrkYy 1TLg== X-Gm-Message-State: AFqh2kqaU20uhNSKOpwJSGdJo1AuWJGgcAhb1tIwWQCGY7SIGsnZehQf QC9QnGk5s2DyQxtamZwR4BsGWw== X-Received: by 2002:a17:906:99d6:b0:7c1:7c3a:5c65 with SMTP id s22-20020a17090699d600b007c17c3a5c65mr44075910ejn.4.1672926794766; Thu, 05 Jan 2023 05:53:14 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:43c3:8ac4:5d6f:2251]) by smtp.gmail.com with ESMTPSA id x11-20020a170906b08b00b007806c1474e1sm16459084ejy.127.2023.01.05.05.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 05:53:14 -0800 (PST) Subject: [PATCH v2 0/7] media: uvcvideo: Hot fixes for top of next/uvc + std menus MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIADPWtmMC/22MQQrDIBRErxL+ur+oqZh01XuULox+VEgUtAoleP dK110Nb5h5JxTKgQrcpxMytVBCigPEZQLjdXSEwQ4GwcTMOJNYm0FnjEQllOI3Pq+rlTDmmy6EW9 bR+HGIdd9H6UN5p/z56Rsf8fxjahwZLlIyS0owWsTD+JyOUI9ryg5evfcvCL/cwKgAAAA= From: Ricardo Ribalda Date: Thu, 05 Jan 2023 14:52:51 +0100 Message-Id: <20230105-uvc-gcc5-v2-0-2ba6c660d6f5@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: Ricardo Ribalda , linux-media@vger.kernel.org, Yunke Cao , linux-kernel@vger.kernel.org, Sergey Senozhatsky X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=1812; i=ribalda@chromium.org; h=from:subject:message-id; bh=FX5eF0xbfjbPcjejb97Gwov/ihOnN90O7mGjzsmiwjg=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjttY5bPHt1+0ap2FYizqXYtJlOgG2qFwn50O4GiVz 5rJ6ITqJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY7bWOQAKCRDRN9E+zzrEiIl/D/ 4lQ39c2y4GHZRuyyKhZQHeTzqMuHfUeple8Scczh89C5MpRErSmcAzNqzMR6b+RwQL9JZRCUCEleGd NOyOMKaK7OC/z8GvSPe8BnUTPI4VLpLPDX0E9jY+hVdxQ69sgPTDh1V39GzaMQXWkgzkhTAzfUvoZg lQCsbAV5ORt2fY42HeFuYxhlBRDkTAplLE6QoPsEyuDF9IMCVfMi4Ic0dezZy4qcDULZjO5CdNy6Ko b/v6nlXgGzplCdtH55jlDz9kZOmCbbkKTUKKST2Xi63Ni3nq/iWg+G1lS72YXS6B/PTSSbR/qTYBsy 7J+KsBCqcEDrRZTbXOgD1fSrLqKNZjkUcsbM52sXOxjskE5hfgrYo2II1yNxyqh+UOVXE/8RmGxalh glSycuK1zKAk1Si6gGWOTiOvQ+kHcjE40oVjJa58qAbuDtKcKFGVAF4CoyHAlSjdo04VAo9Xujh58o VDU6C2ttAq+iy4QEhOZaJxO8Vs5tINkgGNfBkpL6td0UwPvkmVsFs48M1rjr9c6n10zzIHwn9AnrZu iVqKpOVfFFpOnUp3fHfziUrNGALdBon3WuRoAJUMlTaEBhw2LhhQ376FwLLGRe5HWpBZdirACp3hc/ tAR2EIpsQPj5I0Oj09eCR+EPRX1vT/y1NVoRerf70JaHRVpCVZ3mu5LjFOCg== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754191119936843476?= X-GMAIL-MSGID: =?utf-8?q?1754191119936843476?= Hi Laurent Here are some fixes for your next branch. We have not sent yet the patches to Mauro so I guess it is better to drop the broken patches and their reverts from this set. If it is too late the revert patches have the proper Fixes: tag Thanks! Cc: Sergey Senozhatsky Cc: Yunke Cao To: Laurent Pinchart To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Ricardo Ribalda --- Changes in v2: - Remove the wrongly added: Signed-off-by: Laurent - Append the: "Use standard names for menus" patch - Link to v1: https://lore.kernel.org/r/20230105-uvc-gcc5-v1-0-8550de720e82@chromium.org --- Ricardo Ribalda (7): Revert "media: uvcvideo: Fix power line control for Lenovo Integrated Camera" Revert "media: uvcvideo: Implement mask for V4L2_CTRL_TYPE_MENU" media: uvcvideo: Implement mask for V4L2_CTRL_TYPE_MENU media: uvcvideo: Refactor uvc_ctrl_mappings_uvcXX media: uvcvideo: Refactor power_line_frequency_controls_limited media: uvcvideo: Fix power line control for Lenovo Integrated Camera media: uvcvideo: Use standard names for menus drivers/media/usb/uvc/uvc_ctrl.c | 191 ++++++++++++++++++++++++------------- drivers/media/usb/uvc/uvc_driver.c | 25 +---- drivers/media/usb/uvc/uvc_v4l2.c | 105 ++++++++++++++------ drivers/media/usb/uvc/uvcvideo.h | 4 +- include/uapi/linux/uvcvideo.h | 4 +- 5 files changed, 213 insertions(+), 116 deletions(-) --- base-commit: fb1316b0ff3fc3cd98637040ee17ab7be753aac7 change-id: 20230105-uvc-gcc5-7277141399d5 Best regards,