Commit a7c28150 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Laurent Pinchart
Browse files

media: uvcvideo: Fix power line control for Lenovo Integrated Camera 



The device does not implement the power line frequenyc control
correctly. It is a UVC 1.5 device, but implements the 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: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 3aa8628e

drivers/media/usb/uvc/uvc_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited = { 
				  V4L2_CID_POWER_LINE_FREQUENCY_50HZ),

};



static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11 = {

const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11 = {

	.id		= V4L2_CID_POWER_LINE_FREQUENCY,

	.entity		= UVC_GUID_UVC_PROCESSING,

	.selector	= UVC_PU_POWER_LINE_FREQUENCY_CONTROL,

drivers/media/usb/uvc/uvc_driver.c

+16 −0
Original line number Diff line number Diff line
@@ -2365,6 +2365,13 @@ static const struct uvc_device_info uvc_ctrl_power_line_limited = { 
	},

};



static const struct uvc_device_info uvc_ctrl_power_line_uvc11 = {

	.mappings = (const struct uvc_control_mapping *[]) {

		&uvc_ctrl_power_line_mapping_uvc11,

		NULL, /* Sentinel */

	},

};



static const struct uvc_device_info uvc_quirk_probe_minmax = {

	.quirks = UVC_QUIRK_PROBE_MINMAX,

};
@@ -2944,6 +2951,15 @@ static const struct usb_device_id uvc_ids[] = { 
	  .bInterfaceSubClass	= 1,

	  .bInterfaceProtocol	= 0,

	  .driver_info		= UVC_INFO_QUIRK(UVC_QUIRK_FORCE_BPP) },

	/* Lenovo Integrated Camera */

	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE

				| USB_DEVICE_ID_MATCH_INT_INFO,

	  .idVendor		= 0x30c9,

	  .idProduct		= 0x0093,

	  .bInterfaceClass	= USB_CLASS_VIDEO,

	  .bInterfaceSubClass	= 1,

	  .bInterfaceProtocol	= UVC_PC_PROTOCOL_15,

	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 },

	/* Sonix Technology USB 2.0 Camera */

	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE

				| USB_DEVICE_ID_MATCH_INT_INFO,

drivers/media/usb/uvc/uvcvideo.h

+1 −0
Original line number Diff line number Diff line
@@ -746,6 +746,7 @@ void uvc_status_stop(struct uvc_device *dev); 


/* Controls */

extern const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited;

extern const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11;

extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops;



int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,