* [PATCH v5 1/5] media: uvcvideo: Factor out gpio functions to its own file
2025-07-18 15:29 [PATCH v5 0/5] media: uvcvideo: Implement the Privacy GPIO as a evdev Ricardo Ribalda
@ 2025-07-18 15:29 ` Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 2/5] media: uvcvideo: Re-implement privacy GPIO as an input device Ricardo Ribalda
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ricardo Ribalda @ 2025-07-18 15:29 UTC (permalink / raw)
To: Laurent Pinchart, Mauro Carvalho Chehab, Sakari Ailus,
Hans de Goede, Linus Walleij, Bartosz Golaszewski,
Greg Kroah-Hartman
Cc: linux-kernel, linux-media, Yunke Cao, linux-gpio, linux-usb,
Ricardo Ribalda, Hans Verkuil, Hans de Goede
This is just a refactor patch, no new functionality is added.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/Makefile | 3 +-
drivers/media/usb/uvc/uvc_driver.c | 121 +-----------------------------------
drivers/media/usb/uvc/uvc_gpio.c | 122 +++++++++++++++++++++++++++++++++++++
drivers/media/usb/uvc/uvcvideo.h | 7 +++
4 files changed, 133 insertions(+), 120 deletions(-)
diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile
index 4f9eee4f81ab6436a8b90324a688a149b2c3bcd1..85514b6e538fbb8284e574ca14700f2d749e1a2e 100644
--- a/drivers/media/usb/uvc/Makefile
+++ b/drivers/media/usb/uvc/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
- uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o
+ uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o \
+ uvc_gpio.o
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
uvcvideo-objs += uvc_entity.o
endif
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 775bede0d93d9b3e5391914aa395326d3de6a3b1..56bf741e55ed22052f2f4773244ef49c08a2fdae 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -8,7 +8,6 @@
#include <linux/atomic.h>
#include <linux/bits.h>
-#include <linux/gpio/consumer.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/module.h>
@@ -795,8 +794,8 @@ static const u8 uvc_media_transport_input_guid[16] =
UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT;
static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING;
-static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id,
- unsigned int num_pads, unsigned int extra_size)
+struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pads,
+ unsigned int extra_size)
{
struct uvc_entity *entity;
unsigned int num_inputs;
@@ -1245,122 +1244,6 @@ static int uvc_parse_control(struct uvc_device *dev)
return 0;
}
-/* -----------------------------------------------------------------------------
- * Privacy GPIO
- */
-
-static void uvc_gpio_event(struct uvc_device *dev)
-{
- struct uvc_entity *unit = dev->gpio_unit;
- struct uvc_video_chain *chain;
- u8 new_val;
-
- if (!unit)
- return;
-
- new_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
-
- /* GPIO entities are always on the first chain. */
- chain = list_first_entry(&dev->chains, struct uvc_video_chain, list);
- uvc_ctrl_status_event(chain, unit->controls, &new_val);
-}
-
-static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *entity,
- u8 cs, void *data, u16 size)
-{
- if (cs != UVC_CT_PRIVACY_CONTROL || size < 1)
- return -EINVAL;
-
- *(u8 *)data = gpiod_get_value_cansleep(entity->gpio.gpio_privacy);
-
- return 0;
-}
-
-static int uvc_gpio_get_info(struct uvc_device *dev, struct uvc_entity *entity,
- u8 cs, u8 *caps)
-{
- if (cs != UVC_CT_PRIVACY_CONTROL)
- return -EINVAL;
-
- *caps = UVC_CONTROL_CAP_GET | UVC_CONTROL_CAP_AUTOUPDATE;
- return 0;
-}
-
-static irqreturn_t uvc_gpio_irq(int irq, void *data)
-{
- struct uvc_device *dev = data;
-
- uvc_gpio_event(dev);
- return IRQ_HANDLED;
-}
-
-static int uvc_gpio_parse(struct uvc_device *dev)
-{
- struct uvc_entity *unit;
- struct gpio_desc *gpio_privacy;
- int irq;
-
- gpio_privacy = devm_gpiod_get_optional(&dev->intf->dev, "privacy",
- GPIOD_IN);
- if (!gpio_privacy)
- return 0;
-
- if (IS_ERR(gpio_privacy))
- return dev_err_probe(&dev->intf->dev,
- PTR_ERR(gpio_privacy),
- "Can't get privacy GPIO\n");
-
- irq = gpiod_to_irq(gpio_privacy);
- if (irq < 0)
- return dev_err_probe(&dev->intf->dev, irq,
- "No IRQ for privacy GPIO\n");
-
- unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
- if (!unit)
- return -ENOMEM;
-
- unit->gpio.gpio_privacy = gpio_privacy;
- unit->gpio.irq = irq;
- unit->gpio.bControlSize = 1;
- unit->gpio.bmControls = (u8 *)unit + sizeof(*unit);
- unit->gpio.bmControls[0] = 1;
- unit->get_cur = uvc_gpio_get_cur;
- unit->get_info = uvc_gpio_get_info;
- strscpy(unit->name, "GPIO", sizeof(unit->name));
-
- list_add_tail(&unit->list, &dev->entities);
-
- dev->gpio_unit = unit;
-
- return 0;
-}
-
-static int uvc_gpio_init_irq(struct uvc_device *dev)
-{
- struct uvc_entity *unit = dev->gpio_unit;
- int ret;
-
- if (!unit || unit->gpio.irq < 0)
- return 0;
-
- ret = request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq,
- IRQF_ONESHOT | IRQF_TRIGGER_FALLING |
- IRQF_TRIGGER_RISING,
- "uvc_privacy_gpio", dev);
-
- unit->gpio.initialized = !ret;
-
- return ret;
-}
-
-static void uvc_gpio_deinit(struct uvc_device *dev)
-{
- if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized)
- return;
-
- free_irq(dev->gpio_unit->gpio.irq, dev);
-}
-
/* ------------------------------------------------------------------------
* UVC device scan
*/
diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_gpio.c
new file mode 100644
index 0000000000000000000000000000000000000000..45c169eb933815baab3d166abace46f269d9241e
--- /dev/null
+++ b/drivers/media/usb/uvc/uvc_gpio.c
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * uvc_gpio.c -- USB Video Class driver
+ *
+ * Copyright 2024 Google LLC
+ */
+
+#include <linux/kernel.h>
+#include <linux/gpio/consumer.h>
+#include "uvcvideo.h"
+
+static void uvc_gpio_event(struct uvc_device *dev)
+{
+ struct uvc_entity *unit = dev->gpio_unit;
+ struct uvc_video_chain *chain;
+ u8 new_val;
+
+ if (!unit)
+ return;
+
+ new_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
+
+ /* GPIO entities are always on the first chain. */
+ chain = list_first_entry(&dev->chains, struct uvc_video_chain, list);
+ uvc_ctrl_status_event(chain, unit->controls, &new_val);
+}
+
+static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *entity,
+ u8 cs, void *data, u16 size)
+{
+ if (cs != UVC_CT_PRIVACY_CONTROL || size < 1)
+ return -EINVAL;
+
+ *(u8 *)data = gpiod_get_value_cansleep(entity->gpio.gpio_privacy);
+
+ return 0;
+}
+
+static int uvc_gpio_get_info(struct uvc_device *dev, struct uvc_entity *entity,
+ u8 cs, u8 *caps)
+{
+ if (cs != UVC_CT_PRIVACY_CONTROL)
+ return -EINVAL;
+
+ *caps = UVC_CONTROL_CAP_GET | UVC_CONTROL_CAP_AUTOUPDATE;
+ return 0;
+}
+
+static irqreturn_t uvc_gpio_irq(int irq, void *data)
+{
+ struct uvc_device *dev = data;
+
+ uvc_gpio_event(dev);
+ return IRQ_HANDLED;
+}
+
+int uvc_gpio_parse(struct uvc_device *dev)
+{
+ struct uvc_entity *unit;
+ struct gpio_desc *gpio_privacy;
+ int irq;
+
+ gpio_privacy = devm_gpiod_get_optional(&dev->intf->dev, "privacy",
+ GPIOD_IN);
+ if (!gpio_privacy)
+ return 0;
+
+ if (IS_ERR(gpio_privacy))
+ return dev_err_probe(&dev->intf->dev,
+ PTR_ERR(gpio_privacy),
+ "Can't get privacy GPIO\n");
+
+ irq = gpiod_to_irq(gpio_privacy);
+ if (irq < 0)
+ return dev_err_probe(&dev->intf->dev, irq,
+ "No IRQ for privacy GPIO\n");
+
+ unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
+ if (!unit)
+ return -ENOMEM;
+
+ unit->gpio.gpio_privacy = gpio_privacy;
+ unit->gpio.irq = irq;
+ unit->gpio.bControlSize = 1;
+ unit->gpio.bmControls = (u8 *)unit + sizeof(*unit);
+ unit->gpio.bmControls[0] = 1;
+ unit->get_cur = uvc_gpio_get_cur;
+ unit->get_info = uvc_gpio_get_info;
+ strscpy(unit->name, "GPIO", sizeof(unit->name));
+
+ list_add_tail(&unit->list, &dev->entities);
+
+ dev->gpio_unit = unit;
+
+ return 0;
+}
+
+int uvc_gpio_init_irq(struct uvc_device *dev)
+{
+ struct uvc_entity *unit = dev->gpio_unit;
+ int ret;
+
+ if (!unit || unit->gpio.irq < 0)
+ return 0;
+
+ ret = request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq,
+ IRQF_ONESHOT | IRQF_TRIGGER_FALLING |
+ IRQF_TRIGGER_RISING,
+ "uvc_privacy_gpio", dev);
+
+ unit->gpio.initialized = !ret;
+
+ return ret;
+}
+
+void uvc_gpio_deinit(struct uvc_device *dev)
+{
+ if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized)
+ return;
+
+ free_irq(dev->gpio_unit->gpio.irq, dev);
+}
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 757254fc4fe930ae61c9d0425f04d4cd074a617e..63df6fb89ed29c76ed0ded9283a2c5e817bf6500 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -688,6 +688,8 @@ do { \
*/
struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);
+struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pads,
+ unsigned int extra_size);
/* Video buffers queue management. */
int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type);
@@ -814,4 +816,9 @@ void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream);
size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,
size_t size);
+/* gpio */
+int uvc_gpio_parse(struct uvc_device *dev);
+int uvc_gpio_init_irq(struct uvc_device *dev);
+void uvc_gpio_deinit(struct uvc_device *dev);
+
#endif
--
2.50.0.727.gbf7dc18ff4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v5 2/5] media: uvcvideo: Re-implement privacy GPIO as an input device
2025-07-18 15:29 [PATCH v5 0/5] media: uvcvideo: Implement the Privacy GPIO as a evdev Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 1/5] media: uvcvideo: Factor out gpio functions to its own file Ricardo Ribalda
@ 2025-07-18 15:29 ` Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 3/5] media: uvcvideo: Introduce UVC_QUIRK_PRIVACY_DURING_STREAM Ricardo Ribalda
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ricardo Ribalda @ 2025-07-18 15:29 UTC (permalink / raw)
To: Laurent Pinchart, Mauro Carvalho Chehab, Sakari Ailus,
Hans de Goede, Linus Walleij, Bartosz Golaszewski,
Greg Kroah-Hartman
Cc: linux-kernel, linux-media, Yunke Cao, linux-gpio, linux-usb,
Ricardo Ribalda, Hans Verkuil, Hans de Goede
Reimplement privacy GPIO as an input device.
This is an attempt to unify how we notify userspace about a camera that
is covered.
Replace the previous V4L2_CID_PRIVACY control with evdev
SW_CAMERA_LENS_COVER.
This has some main benefits:
- It unifies behaviour with other drivers.
- It allows reading the privacy events without powering up the camera.
- It allows reading the privacy gpio and the internal gpio control (if
present).
Although this introduces an ABI change, we have only seen ChromeOS using
this feature.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/Kconfig | 2 +-
drivers/media/usb/uvc/Makefile | 6 ++--
drivers/media/usb/uvc/uvc_ctrl.c | 20 -----------
drivers/media/usb/uvc/uvc_driver.c | 3 +-
drivers/media/usb/uvc/uvc_gpio.c | 72 +++++++++++++-------------------------
drivers/media/usb/uvc/uvc_status.c | 13 +++++--
drivers/media/usb/uvc/uvcvideo.h | 15 +++++---
7 files changed, 51 insertions(+), 80 deletions(-)
diff --git a/drivers/media/usb/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig
index 579532272fd6d7a8ef65c1a3a892b723f40e584e..cdbba7fd5bee2427d7f908283a6648d0a4888e0d 100644
--- a/drivers/media/usb/uvc/Kconfig
+++ b/drivers/media/usb/uvc/Kconfig
@@ -17,6 +17,6 @@ config USB_VIDEO_CLASS_INPUT_EVDEV
depends on USB_VIDEO_CLASS=INPUT || INPUT=y
help
This option makes USB Video Class devices register an input device
- to report button events.
+ to report button events and privacy GPIO.
If you are in doubt, say Y.
diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile
index 85514b6e538fbb8284e574ca14700f2d749e1a2e..b36b124da7a8190760353b22805e8cd23a7723c2 100644
--- a/drivers/media/usb/uvc/Makefile
+++ b/drivers/media/usb/uvc/Makefile
@@ -1,8 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
- uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o \
- uvc_gpio.o
+ uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
uvcvideo-objs += uvc_entity.o
endif
+ifeq ($(CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV),y)
+uvcvideo-objs += uvc_gpio.o
+endif
obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index efe609d7087752cb2ef516eef0fce12acd13e747..17a9af857308c6311824807f6e3438974bc88f55 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -350,14 +350,6 @@ 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_AUTO_UPDATE is needed because the RoI may get updated
* by sensors.
@@ -939,15 +931,6 @@ 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,
- .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,
- },
{
.entity = UVC_GUID_UVC_PROCESSING,
.selector = UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
@@ -3252,9 +3235,6 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain *chain)
} else if (UVC_ENTITY_TYPE(entity) == UVC_ITT_CAMERA) {
bmControls = entity->camera.bmControls;
bControlSize = entity->camera.bControlSize;
- } else if (UVC_ENTITY_TYPE(entity) == UVC_EXT_GPIO_UNIT) {
- bmControls = entity->gpio.bmControls;
- bControlSize = entity->gpio.bControlSize;
}
/* Remove bogus/blacklisted controls */
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 56bf741e55ed22052f2f4773244ef49c08a2fdae..89a4ac8a358f508220bca43078964bc2a8a6c4a5 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2158,6 +2158,7 @@ static int uvc_probe(struct usb_interface *intf,
if (ret < 0)
goto error;
#endif
+
/* Save our data pointer in the interface data. */
usb_set_intfdata(intf, dev);
@@ -2169,7 +2170,7 @@ static int uvc_probe(struct usb_interface *intf,
ret);
}
- ret = uvc_gpio_init_irq(dev);
+ ret = uvc_gpio_init(dev);
if (ret < 0) {
dev_err(&dev->udev->dev,
"Unable to request privacy GPIO IRQ (%d)\n", ret);
diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_gpio.c
index 45c169eb933815baab3d166abace46f269d9241e..93727185b9125d5a0ebf7fcede5ed8983ecddd5f 100644
--- a/drivers/media/usb/uvc/uvc_gpio.c
+++ b/drivers/media/usb/uvc/uvc_gpio.c
@@ -7,57 +7,29 @@
#include <linux/kernel.h>
#include <linux/gpio/consumer.h>
+#include <linux/input.h>
#include "uvcvideo.h"
-static void uvc_gpio_event(struct uvc_device *dev)
-{
- struct uvc_entity *unit = dev->gpio_unit;
- struct uvc_video_chain *chain;
- u8 new_val;
-
- if (!unit)
- return;
-
- new_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
-
- /* GPIO entities are always on the first chain. */
- chain = list_first_entry(&dev->chains, struct uvc_video_chain, list);
- uvc_ctrl_status_event(chain, unit->controls, &new_val);
-}
-
-static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *entity,
- u8 cs, void *data, u16 size)
-{
- if (cs != UVC_CT_PRIVACY_CONTROL || size < 1)
- return -EINVAL;
-
- *(u8 *)data = gpiod_get_value_cansleep(entity->gpio.gpio_privacy);
-
- return 0;
-}
-
-static int uvc_gpio_get_info(struct uvc_device *dev, struct uvc_entity *entity,
- u8 cs, u8 *caps)
-{
- if (cs != UVC_CT_PRIVACY_CONTROL)
- return -EINVAL;
-
- *caps = UVC_CONTROL_CAP_GET | UVC_CONTROL_CAP_AUTOUPDATE;
- return 0;
-}
-
static irqreturn_t uvc_gpio_irq(int irq, void *data)
{
struct uvc_device *dev = data;
+ struct uvc_gpio *uvc_gpio = &dev->gpio_unit->gpio;
+ int new_val;
+
+ new_val = gpiod_get_value_cansleep(uvc_gpio->gpio_privacy);
+ if (new_val < 0)
+ return IRQ_HANDLED;
+
+ input_report_switch(dev->input, SW_CAMERA_LENS_COVER, new_val);
+ input_sync(dev->input);
- uvc_gpio_event(dev);
return IRQ_HANDLED;
}
int uvc_gpio_parse(struct uvc_device *dev)
{
- struct uvc_entity *unit;
struct gpio_desc *gpio_privacy;
+ struct uvc_entity *unit;
int irq;
gpio_privacy = devm_gpiod_get_optional(&dev->intf->dev, "privacy",
@@ -81,13 +53,7 @@ int uvc_gpio_parse(struct uvc_device *dev)
unit->gpio.gpio_privacy = gpio_privacy;
unit->gpio.irq = irq;
- unit->gpio.bControlSize = 1;
- unit->gpio.bmControls = (u8 *)unit + sizeof(*unit);
- unit->gpio.bmControls[0] = 1;
- unit->get_cur = uvc_gpio_get_cur;
- unit->get_info = uvc_gpio_get_info;
strscpy(unit->name, "GPIO", sizeof(unit->name));
-
list_add_tail(&unit->list, &dev->entities);
dev->gpio_unit = unit;
@@ -95,22 +61,32 @@ int uvc_gpio_parse(struct uvc_device *dev)
return 0;
}
-int uvc_gpio_init_irq(struct uvc_device *dev)
+int uvc_gpio_init(struct uvc_device *dev)
{
struct uvc_entity *unit = dev->gpio_unit;
+ int init_val;
int ret;
if (!unit || unit->gpio.irq < 0)
return 0;
+ init_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
+ if (init_val < 0)
+ return init_val;
+
ret = request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq,
IRQF_ONESHOT | IRQF_TRIGGER_FALLING |
IRQF_TRIGGER_RISING,
"uvc_privacy_gpio", dev);
+ if (ret)
+ return ret;
+
+ input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val);
+ input_sync(dev->input);
- unit->gpio.initialized = !ret;
+ unit->gpio.initialized = true;
- return ret;
+ return 0;
}
void uvc_gpio_deinit(struct uvc_device *dev)
diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
index ee01dce4b7834b05aab95379191c305cf8cec7f7..664ba59af8ecad5511c9dea924bf037b2aafc0d0 100644
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
@@ -44,7 +44,7 @@ static int uvc_input_init(struct uvc_device *dev)
struct input_dev *input;
int ret;
- if (!uvc_input_has_button(dev))
+ if (!uvc_input_has_button(dev) && !dev->gpio_unit)
return 0;
input = input_allocate_device();
@@ -59,8 +59,15 @@ static int uvc_input_init(struct uvc_device *dev)
usb_to_input_id(dev->udev, &input->id);
input->dev.parent = &dev->intf->dev;
- __set_bit(EV_KEY, input->evbit);
- __set_bit(KEY_CAMERA, input->keybit);
+ if (uvc_input_has_button(dev)) {
+ __set_bit(EV_KEY, input->evbit);
+ __set_bit(KEY_CAMERA, input->keybit);
+ }
+
+ if (dev->gpio_unit) {
+ __set_bit(EV_SW, input->evbit);
+ __set_bit(SW_CAMERA_LENS_COVER, input->swbit);
+ }
if ((ret = input_register_device(input)) < 0)
goto error;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 63df6fb89ed29c76ed0ded9283a2c5e817bf6500..aca857d3f5608550faa5241f3b515bb9837f70ab 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -15,6 +15,7 @@
#include <linux/videodev2.h>
#include <linux/workqueue.h>
#include <media/media-device.h>
+#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
#include <media/v4l2-fh.h>
@@ -238,12 +239,10 @@ struct uvc_entity {
u8 *bmControlsType;
} extension;
- struct {
- u8 bControlSize;
- u8 *bmControls;
- struct gpio_desc *gpio_privacy;
+ struct uvc_gpio {
int irq;
bool initialized;
+ struct gpio_desc *gpio_privacy;
} gpio;
};
@@ -817,8 +816,14 @@ size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,
size_t size);
/* gpio */
+#ifdef CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV
int uvc_gpio_parse(struct uvc_device *dev);
-int uvc_gpio_init_irq(struct uvc_device *dev);
+int uvc_gpio_init(struct uvc_device *dev);
void uvc_gpio_deinit(struct uvc_device *dev);
+#else
+static inline int uvc_gpio_parse(struct uvc_device *dev) {return 0; }
+static inline int uvc_gpio_init(struct uvc_device *dev) {return 0; }
+static inline void uvc_gpio_deinit(struct uvc_device *dev) {};
+#endif
#endif
--
2.50.0.727.gbf7dc18ff4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v5 3/5] media: uvcvideo: Introduce UVC_QUIRK_PRIVACY_DURING_STREAM
2025-07-18 15:29 [PATCH v5 0/5] media: uvcvideo: Implement the Privacy GPIO as a evdev Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 1/5] media: uvcvideo: Factor out gpio functions to its own file Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 2/5] media: uvcvideo: Re-implement privacy GPIO as an input device Ricardo Ribalda
@ 2025-07-18 15:29 ` Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 4/5] media: uvcvideo: Make gpio_unit entity-less Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 5/5] media: uvcvideo: Remove UVC_EXT_GPIO entity Ricardo Ribalda
4 siblings, 0 replies; 6+ messages in thread
From: Ricardo Ribalda @ 2025-07-18 15:29 UTC (permalink / raw)
To: Laurent Pinchart, Mauro Carvalho Chehab, Sakari Ailus,
Hans de Goede, Linus Walleij, Bartosz Golaszewski,
Greg Kroah-Hartman
Cc: linux-kernel, linux-media, Yunke Cao, linux-gpio, linux-usb,
Ricardo Ribalda, Hans Verkuil, Hans de Goede
Some devices power the GPIO pull-up with the same power-supply as the
camera. Avoid reading the GPIO if the device is not streaming.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_gpio.c | 58 ++++++++++++++++++++++++++++++++++++---
drivers/media/usb/uvc/uvc_video.c | 4 +++
drivers/media/usb/uvc/uvcvideo.h | 4 +++
3 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_gpio.c
index 93727185b9125d5a0ebf7fcede5ed8983ecddd5f..f575b848058f48e3b73a6793e59d25a3eed1c61a 100644
--- a/drivers/media/usb/uvc/uvc_gpio.c
+++ b/drivers/media/usb/uvc/uvc_gpio.c
@@ -5,6 +5,7 @@
* Copyright 2024 Google LLC
*/
+#include <linux/dmi.h>
#include <linux/kernel.h>
#include <linux/gpio/consumer.h>
#include <linux/input.h>
@@ -16,6 +17,9 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data)
struct uvc_gpio *uvc_gpio = &dev->gpio_unit->gpio;
int new_val;
+ if (!uvc_gpio->gpio_ready)
+ return IRQ_HANDLED;
+
new_val = gpiod_get_value_cansleep(uvc_gpio->gpio_privacy);
if (new_val < 0)
return IRQ_HANDLED;
@@ -26,6 +30,24 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data)
return IRQ_HANDLED;
}
+static const struct dmi_system_id privacy_valid_during_streamon[] = {
+ {
+ .ident = "HP Elite c1030 Chromebook",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Jinlon"),
+ },
+ },
+ {
+ .ident = "HP Pro c640 Chromebook",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Dratini"),
+ },
+ },
+ { } /* terminate list */
+};
+
int uvc_gpio_parse(struct uvc_device *dev)
{
struct gpio_desc *gpio_privacy;
@@ -51,6 +73,15 @@ int uvc_gpio_parse(struct uvc_device *dev)
if (!unit)
return -ENOMEM;
+ /*
+ * Note: This quirk will not match external UVC cameras,
+ * as they will not have the corresponding ACPI GPIO entity.
+ */
+ if (dmi_check_system(privacy_valid_during_streamon))
+ dev->quirks |= UVC_QUIRK_PRIVACY_DURING_STREAM;
+ else
+ unit->gpio.gpio_ready = true;
+
unit->gpio.gpio_privacy = gpio_privacy;
unit->gpio.irq = irq;
strscpy(unit->name, "GPIO", sizeof(unit->name));
@@ -61,6 +92,16 @@ int uvc_gpio_parse(struct uvc_device *dev)
return 0;
}
+void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on)
+{
+ if (!dev->gpio_unit || !(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM))
+ return;
+
+ dev->gpio_unit->gpio.gpio_ready = stream_on;
+ if (stream_on)
+ uvc_gpio_irq(0, dev);
+}
+
int uvc_gpio_init(struct uvc_device *dev)
{
struct uvc_entity *unit = dev->gpio_unit;
@@ -70,10 +111,6 @@ int uvc_gpio_init(struct uvc_device *dev)
if (!unit || unit->gpio.irq < 0)
return 0;
- init_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
- if (init_val < 0)
- return init_val;
-
ret = request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq,
IRQF_ONESHOT | IRQF_TRIGGER_FALLING |
IRQF_TRIGGER_RISING,
@@ -81,6 +118,19 @@ int uvc_gpio_init(struct uvc_device *dev)
if (ret)
return ret;
+ if ((dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)) {
+ uvc_gpio_quirk(dev, false);
+ init_val = false;
+ } else {
+ unit->gpio.gpio_ready = true;
+
+ init_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
+ if (init_val < 0) {
+ free_irq(unit->gpio.irq, dev);
+ return init_val;
+ }
+ }
+
input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val);
input_sync(dev->input);
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 2e377e7b9e81599aca19b800a171cc16a09c1e8a..516cf9bccc25ce2b7c82a3f97826e77287bdd1af 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -2356,6 +2356,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream)
if (ret < 0)
goto error_video;
+ uvc_gpio_quirk(stream->dev, true);
+
return 0;
error_video:
@@ -2368,6 +2370,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream)
void uvc_video_stop_streaming(struct uvc_streaming *stream)
{
+ uvc_gpio_quirk(stream->dev, false);
+
uvc_video_stop_transfer(stream, 1);
if (stream->intf->num_altsetting > 1) {
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index aca857d3f5608550faa5241f3b515bb9837f70ab..827ea2eb676c81cabb8051485b6e6813e9c6dca8 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -79,6 +79,7 @@
#define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000
#define UVC_QUIRK_MJPEG_NO_EOF 0x00020000
#define UVC_QUIRK_MSXU_META 0x00040000
+#define UVC_QUIRK_PRIVACY_DURING_STREAM 0x00080000
/* Format flags */
#define UVC_FMT_FLAG_COMPRESSED 0x00000001
@@ -242,6 +243,7 @@ struct uvc_entity {
struct uvc_gpio {
int irq;
bool initialized;
+ bool gpio_ready;
struct gpio_desc *gpio_privacy;
} gpio;
};
@@ -820,10 +822,12 @@ size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,
int uvc_gpio_parse(struct uvc_device *dev);
int uvc_gpio_init(struct uvc_device *dev);
void uvc_gpio_deinit(struct uvc_device *dev);
+void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on);
#else
static inline int uvc_gpio_parse(struct uvc_device *dev) {return 0; }
static inline int uvc_gpio_init(struct uvc_device *dev) {return 0; }
static inline void uvc_gpio_deinit(struct uvc_device *dev) {};
+static inline void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on) {};
#endif
#endif
--
2.50.0.727.gbf7dc18ff4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v5 4/5] media: uvcvideo: Make gpio_unit entity-less
2025-07-18 15:29 [PATCH v5 0/5] media: uvcvideo: Implement the Privacy GPIO as a evdev Ricardo Ribalda
` (2 preceding siblings ...)
2025-07-18 15:29 ` [PATCH v5 3/5] media: uvcvideo: Introduce UVC_QUIRK_PRIVACY_DURING_STREAM Ricardo Ribalda
@ 2025-07-18 15:29 ` Ricardo Ribalda
2025-07-18 15:29 ` [PATCH v5 5/5] media: uvcvideo: Remove UVC_EXT_GPIO entity Ricardo Ribalda
4 siblings, 0 replies; 6+ messages in thread
From: Ricardo Ribalda @ 2025-07-18 15:29 UTC (permalink / raw)
To: Laurent Pinchart, Mauro Carvalho Chehab, Sakari Ailus,
Hans de Goede, Linus Walleij, Bartosz Golaszewski,
Greg Kroah-Hartman
Cc: linux-kernel, linux-media, Yunke Cao, linux-gpio, linux-usb,
Ricardo Ribalda, Hans Verkuil, Hans de Goede
Now that we do not need to export a control there is no need to create
an entity. Move the uvc_gpio structure to uvc_device.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_driver.c | 7 -------
drivers/media/usb/uvc/uvc_gpio.c | 39 +++++++++++++++-----------------------
drivers/media/usb/uvc/uvc_status.c | 4 ++--
drivers/media/usb/uvc/uvcvideo.h | 2 +-
4 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 89a4ac8a358f508220bca43078964bc2a8a6c4a5..b79d276732bc80ef175ffdbaa73b6395585ff07b 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1755,13 +1755,6 @@ static int uvc_scan_device(struct uvc_device *dev)
return -ENODEV;
}
- /* Add GPIO entity to the first chain. */
- if (dev->gpio_unit) {
- chain = list_first_entry(&dev->chains,
- struct uvc_video_chain, list);
- list_add_tail(&dev->gpio_unit->chain, &chain->entities);
- }
-
return 0;
}
diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_gpio.c
index f575b848058f48e3b73a6793e59d25a3eed1c61a..5da67c260f02dff7bbe2eb3849e8dfc939ad1d82 100644
--- a/drivers/media/usb/uvc/uvc_gpio.c
+++ b/drivers/media/usb/uvc/uvc_gpio.c
@@ -14,7 +14,7 @@
static irqreturn_t uvc_gpio_irq(int irq, void *data)
{
struct uvc_device *dev = data;
- struct uvc_gpio *uvc_gpio = &dev->gpio_unit->gpio;
+ struct uvc_gpio *uvc_gpio = &dev->gpio_unit;
int new_val;
if (!uvc_gpio->gpio_ready)
@@ -51,7 +51,6 @@ static const struct dmi_system_id privacy_valid_during_streamon[] = {
int uvc_gpio_parse(struct uvc_device *dev)
{
struct gpio_desc *gpio_privacy;
- struct uvc_entity *unit;
int irq;
gpio_privacy = devm_gpiod_get_optional(&dev->intf->dev, "privacy",
@@ -69,10 +68,6 @@ int uvc_gpio_parse(struct uvc_device *dev)
return dev_err_probe(&dev->intf->dev, irq,
"No IRQ for privacy GPIO\n");
- unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
- if (!unit)
- return -ENOMEM;
-
/*
* Note: This quirk will not match external UVC cameras,
* as they will not have the corresponding ACPI GPIO entity.
@@ -80,38 +75,33 @@ int uvc_gpio_parse(struct uvc_device *dev)
if (dmi_check_system(privacy_valid_during_streamon))
dev->quirks |= UVC_QUIRK_PRIVACY_DURING_STREAM;
else
- unit->gpio.gpio_ready = true;
-
- unit->gpio.gpio_privacy = gpio_privacy;
- unit->gpio.irq = irq;
- strscpy(unit->name, "GPIO", sizeof(unit->name));
- list_add_tail(&unit->list, &dev->entities);
+ dev->gpio_unit.gpio_ready = true;
- dev->gpio_unit = unit;
+ dev->gpio_unit.gpio_privacy = gpio_privacy;
+ dev->gpio_unit.irq = irq;
return 0;
}
void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on)
{
- if (!dev->gpio_unit || !(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM))
+ if (!(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM))
return;
- dev->gpio_unit->gpio.gpio_ready = stream_on;
+ dev->gpio_unit.gpio_ready = stream_on;
if (stream_on)
uvc_gpio_irq(0, dev);
}
int uvc_gpio_init(struct uvc_device *dev)
{
- struct uvc_entity *unit = dev->gpio_unit;
int init_val;
int ret;
- if (!unit || unit->gpio.irq < 0)
+ if (!dev->gpio_unit.gpio_privacy)
return 0;
- ret = request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq,
+ ret = request_threaded_irq(dev->gpio_unit.irq, NULL, uvc_gpio_irq,
IRQF_ONESHOT | IRQF_TRIGGER_FALLING |
IRQF_TRIGGER_RISING,
"uvc_privacy_gpio", dev);
@@ -122,11 +112,12 @@ int uvc_gpio_init(struct uvc_device *dev)
uvc_gpio_quirk(dev, false);
init_val = false;
} else {
- unit->gpio.gpio_ready = true;
+ dev->gpio_unit.gpio_ready = true;
- init_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
+ init_val =
+ gpiod_get_value_cansleep(dev->gpio_unit.gpio_privacy);
if (init_val < 0) {
- free_irq(unit->gpio.irq, dev);
+ free_irq(dev->gpio_unit.irq, dev);
return init_val;
}
}
@@ -134,15 +125,15 @@ int uvc_gpio_init(struct uvc_device *dev)
input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val);
input_sync(dev->input);
- unit->gpio.initialized = true;
+ dev->gpio_unit.initialized = true;
return 0;
}
void uvc_gpio_deinit(struct uvc_device *dev)
{
- if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized)
+ if (!dev->gpio_unit.initialized)
return;
- free_irq(dev->gpio_unit->gpio.irq, dev);
+ free_irq(dev->gpio_unit.irq, dev);
}
diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
index 664ba59af8ecad5511c9dea924bf037b2aafc0d0..dbffed828761202c62c003b9200fd9916b16a969 100644
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
@@ -44,7 +44,7 @@ static int uvc_input_init(struct uvc_device *dev)
struct input_dev *input;
int ret;
- if (!uvc_input_has_button(dev) && !dev->gpio_unit)
+ if (!uvc_input_has_button(dev) && !dev->gpio_unit.gpio_privacy)
return 0;
input = input_allocate_device();
@@ -64,7 +64,7 @@ static int uvc_input_init(struct uvc_device *dev)
__set_bit(KEY_CAMERA, input->keybit);
}
- if (dev->gpio_unit) {
+ if (dev->gpio_unit.gpio_privacy) {
__set_bit(EV_SW, input->evbit);
__set_bit(SW_CAMERA_LENS_COVER, input->swbit);
}
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 827ea2eb676c81cabb8051485b6e6813e9c6dca8..c098f30b07797281576d7ff533cde25309be8b61 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -628,7 +628,7 @@ struct uvc_device {
const void *data;
} async_ctrl;
- struct uvc_entity *gpio_unit;
+ struct uvc_gpio gpio_unit;
};
struct uvc_fh {
--
2.50.0.727.gbf7dc18ff4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v5 5/5] media: uvcvideo: Remove UVC_EXT_GPIO entity
2025-07-18 15:29 [PATCH v5 0/5] media: uvcvideo: Implement the Privacy GPIO as a evdev Ricardo Ribalda
` (3 preceding siblings ...)
2025-07-18 15:29 ` [PATCH v5 4/5] media: uvcvideo: Make gpio_unit entity-less Ricardo Ribalda
@ 2025-07-18 15:29 ` Ricardo Ribalda
4 siblings, 0 replies; 6+ messages in thread
From: Ricardo Ribalda @ 2025-07-18 15:29 UTC (permalink / raw)
To: Laurent Pinchart, Mauro Carvalho Chehab, Sakari Ailus,
Hans de Goede, Linus Walleij, Bartosz Golaszewski,
Greg Kroah-Hartman
Cc: linux-kernel, linux-media, Yunke Cao, linux-gpio, linux-usb,
Ricardo Ribalda, Hans Verkuil, Hans de Goede
The only implementation of this entity was the external privacy gpio,
which now does not require to emulate an entity.
Remove all the dead code.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_driver.c | 4 ----
drivers/media/usb/uvc/uvc_entity.c | 1 -
drivers/media/usb/uvc/uvcvideo.h | 20 +++++++-------------
include/linux/usb/uvc.h | 3 ---
4 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index b79d276732bc80ef175ffdbaa73b6395585ff07b..d19b5a200971654161267dc755aec2a06b5fdc9e 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -789,7 +789,6 @@ static int uvc_parse_streaming(struct uvc_device *dev,
}
static const u8 uvc_camera_guid[16] = UVC_GUID_UVC_CAMERA;
-static const u8 uvc_gpio_guid[16] = UVC_GUID_EXT_GPIO_CONTROLLER;
static const u8 uvc_media_transport_input_guid[16] =
UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT;
static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING;
@@ -821,9 +820,6 @@ struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pads,
* is initialized by the caller.
*/
switch (type) {
- case UVC_EXT_GPIO_UNIT:
- memcpy(entity->guid, uvc_gpio_guid, 16);
- break;
case UVC_ITT_CAMERA:
memcpy(entity->guid, uvc_camera_guid, 16);
break;
diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c
index cc68dd24eb42dce5b2846ca52a8dfa499c8aed96..94e0119746e4689a45960955a35be93a25bc16c4 100644
--- a/drivers/media/usb/uvc/uvc_entity.c
+++ b/drivers/media/usb/uvc/uvc_entity.c
@@ -105,7 +105,6 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain,
case UVC_OTT_DISPLAY:
case UVC_OTT_MEDIA_TRANSPORT_OUTPUT:
case UVC_EXTERNAL_VENDOR_SPECIFIC:
- case UVC_EXT_GPIO_UNIT:
default:
function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
break;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index c098f30b07797281576d7ff533cde25309be8b61..b4eaca187d61b2e9f8a4af6ac6ac071145b48df2 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -39,9 +39,6 @@
(UVC_ENTITY_IS_TERM(entity) && \
((entity)->type & 0x8000) == UVC_TERM_OUTPUT)
-#define UVC_EXT_GPIO_UNIT 0x7ffe
-#define UVC_EXT_GPIO_UNIT_ID 0x100
-
/* ------------------------------------------------------------------------
* Driver specific constants.
*/
@@ -189,8 +186,7 @@ struct uvc_entity {
/*
* Entities exposed by the UVC device use IDs 0-255, extra entities
- * implemented by the driver (such as the GPIO entity) use IDs 256 and
- * up.
+ * implemented by the driver use IDs 256 and up.
*/
u16 id;
u16 type;
@@ -239,13 +235,6 @@ struct uvc_entity {
u8 *bmControls;
u8 *bmControlsType;
} extension;
-
- struct uvc_gpio {
- int irq;
- bool initialized;
- bool gpio_ready;
- struct gpio_desc *gpio_privacy;
- } gpio;
};
u8 bNrInPins;
@@ -628,7 +617,12 @@ struct uvc_device {
const void *data;
} async_ctrl;
- struct uvc_gpio gpio_unit;
+ struct uvc_gpio {
+ int irq;
+ bool initialized;
+ bool gpio_ready;
+ struct gpio_desc *gpio_privacy;
+ } gpio_unit;
};
struct uvc_fh {
diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h
index ee19e9f915b8370c333c426dc1ee4202c7b75c5b..6858675ce70dc0a872edd47531682bc415f83bd9 100644
--- a/include/linux/usb/uvc.h
+++ b/include/linux/usb/uvc.h
@@ -26,9 +26,6 @@
#define UVC_GUID_UVC_SELECTOR \
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02}
-#define UVC_GUID_EXT_GPIO_CONTROLLER \
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03}
#define UVC_GUID_MSXU_1_5 \
{0xdc, 0x95, 0x3f, 0x0f, 0x32, 0x26, 0x4e, 0x4c, \
0x92, 0xc9, 0xa0, 0x47, 0x82, 0xf4, 0x3b, 0xc8}
--
2.50.0.727.gbf7dc18ff4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread