Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp5765989pxu; Thu, 22 Oct 2020 10:27:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyDRlMLMj6GfunWWv0neVTD4yjJ8FJRc0vjy6BfI1bkPNXn4uQeRNXQIwyDvBl1dl+P0uq X-Received: by 2002:aa7:dcc7:: with SMTP id w7mr3376907edu.54.1603387626135; Thu, 22 Oct 2020 10:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603387626; cv=none; d=google.com; s=arc-20160816; b=oI88g8O3ElcuwycrmcL8BKJA8uKkVo+gnYSde6YqyIGgohrOzC0GU9SDKNZRZ48V8T zvpRgGZYb59t+qUuWhjgampez4zvHJDPOb2YYIfIHsgFTTaqjeBJqVJaiMjW1HBJHYX/ 3cNSBCvPqmNwEeaZH+/jMXIY/JvIep37w9biGhqZ6ILF9KX04Ew6EBswmJTIxtXV0l3X 2JNk21M0zSdP2b1QLhUJ57v2ysoh+6uOPQ7CBrb6L/oj2RDrWPrcYusKLC6A4UQsoohV bDLRUWDWGFXhbF/Dw9aCJcL6aHVng8e5SqYTfioF4SIksIkP2ClSIxX2jMsdwPwzAWi+ SI+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8Hb+989JOofjjUh5aGhwd9WAuZ4cL+L7iJMxJ5IqyWA=; b=ZwmgkxNMsKugIUskpxydOEdUwfNQNCVg7VCS1GL7G6Vxt/KH8dZ+AqE8GDF3ZSKDBv KdPvrytaFVw3aKd6ZJZ/4YinTMHxHjo5pD8YPO8VCYWE9cdwEj4gLkmnco9XalUcohLU Bf0uJNmVBBXGpyUAUy7+N5W1+bquJnKh8DeCgfqrtsj8axmF24kzRMPck7Q50ZyyaLxe hPaR7J9oD9fsqNjMcJJBTkfLrFnuMZQMipd1fv/8qPO83ZBfyNEKRhM/i9fDwlTJl3XU MooSESYOrREk0lHY/rdFdcnIUn0ERWN2eXYUwCmM3adUxplNXiNmRkL6JJP05U9gE764 ceXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=AKmlJVaT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y1si1336642edv.123.2020.10.22.10.26.44; Thu, 22 Oct 2020 10:27:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=AKmlJVaT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S2900256AbgJVNiS (ORCPT + 99 others); Thu, 22 Oct 2020 09:38:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2900206AbgJVNiB (ORCPT ); Thu, 22 Oct 2020 09:38:01 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB2FBC0613CF for ; Thu, 22 Oct 2020 06:38:00 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id l15so2290715wmi.3 for ; Thu, 22 Oct 2020 06:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Hb+989JOofjjUh5aGhwd9WAuZ4cL+L7iJMxJ5IqyWA=; b=AKmlJVaT5Hrvhfka8Opvo4KGn4rXOOHMq018iYikKCOr5GKn74IR9yNWaWbyPpg+9Q 7nMmwl5Ts4ahYOEbBKa0G11DXK0YJ9dRIQS9GH+jEbSzijfTgJVA4CKybQn+cy7JwNcR +6r6dsEJXiwc6tHA55H55+gFsHOgYlOT44+HE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Hb+989JOofjjUh5aGhwd9WAuZ4cL+L7iJMxJ5IqyWA=; b=YSTFlljEnMVMYK5a9WILMxQPh9Q4v7WMlqlmFTk3Yyq7VH8FZrZu4NsdHAiK7/J16U gtlO3jaRGRBjjUZwDCUXCOaoYAIRKUiWKrG1uINU4R+c9IKXxzTiH9wVPmeVedZHy8Jw XKg0aWHbK+nxLmhvx/SzlzNgHXiyjbP/lTmi1q8DU3GLP/f8UHwp62W41pTjkYdr4bvW k3tR8NSV64bPoCbWWHlaqT823vbNmJxyj/EOdg7NfsUQqoZvI+XnsS1n0x2M6CnVyuao vFR/CAKsSyL7oat3M3+5wGRFIG4CjYz8aG38yksGowLXaVbEgkJ940ADk8AeiHpGwJcE mEhg== X-Gm-Message-State: AOAM5337rTpvVpLfefq8e5rGMNeQKs0bLfpDsxQuFM8hCsk9gzs/d5m8 SlswG+a3D0cXW561T0KEKmXUOg== X-Received: by 2002:a1c:9d54:: with SMTP id g81mr2652082wme.102.1603373879643; Thu, 22 Oct 2020 06:37:59 -0700 (PDT) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id q10sm4094031wrp.83.2020.10.22.06.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 06:37:59 -0700 (PDT) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tfiga@chromium.org, Ricardo Ribalda Subject: [PATCH 4/6] media: uvcvideo: Add Privacy control based on EXT_GPIO Date: Thu, 22 Oct 2020 15:37:51 +0200 Message-Id: <20201022133753.310506-5-ribalda@chromium.org> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201022133753.310506-1-ribalda@chromium.org> References: <20201022133753.310506-1-ribalda@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new control and mapping for Privacy controls connected to UVC_GUID_EXT_GPIO_CONTROLLERs. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 20 ++++++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 913739915863..786498e66646 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -347,6 +347,16 @@ static const struct uvc_control_info uvc_ctrls[] = { | UVC_CTRL_FLAG_RESTORE | UVC_CTRL_FLAG_AUTO_UPDATE, }, + { + .entity = UVC_GUID_EXT_GPIO_CONTROLLER, + .selector = UVC_CT_PRIVACY_CONTROL, + .index = 0, + .size = 1, + .flags = UVC_CTRL_FLAG_GET_CUR + | UVC_CTRL_FLAG_AUTO_UPDATE + | UVC_CTRL_FLAG_ENTITY_GET_INFO + | UVC_CTRL_FLAG_ENTITY_GET_CUR, + }, }; static const struct uvc_menu_info power_line_frequency_controls[] = { @@ -735,6 +745,16 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, }, + { + .id = V4L2_CID_PRIVACY, + .name = "Privacy", + .entity = UVC_GUID_EXT_GPIO_CONTROLLER, + .selector = UVC_CT_PRIVACY_CONTROL, + .size = 1, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, + .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, + }, }; /* ------------------------------------------------------------------------ diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 8e5a9fc35820..a493bc383d3e 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -58,7 +58,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02} #define UVC_GUID_EXT_GPIO_CONTROLLER \ {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf, \ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01} + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01} #define UVC_GUID_FORMAT_MJPEG \ { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \ -- 2.29.0.rc1.297.gfa9743e501-goog