Revert "[media] UVC: Add support for ds4 depth camera"

This reverts commit 120c41d3477a23c6941059401db63677736f1935.

The patch doesn't add the corresponding documentation bits to the
media infrastructure uAPI DocBook. Also, they're for 3D formats,
with requre further discussions.

Requested-by: Hans Verkuil <hverkuil@xs4all.nl>
Requested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 922665b59d3809fd1696120afd5d0e2bf4f8e4dd..39abbafad7966a50868ff4c9fe32e097045142d9 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -148,26 +148,6 @@ static struct uvc_format_desc uvc_fmts[] = {
                .guid           = UVC_GUID_FORMAT_H264,
                .fcc            = V4L2_PIX_FMT_H264,
        },
-       {
-               .name           = "Greyscale 8 L/R (Y8I)",
-               .guid           = UVC_GUID_FORMAT_Y8I,
-               .fcc            = V4L2_PIX_FMT_Y8I,
-       },
-       {
-               .name           = "Greyscale 12 L/R (Y12I)",
-               .guid           = UVC_GUID_FORMAT_Y12I,
-               .fcc            = V4L2_PIX_FMT_Y12I,
-       },
-       {
-               .name           = "Depth data 16-bit (Z16)",
-               .guid           = UVC_GUID_FORMAT_Z16,
-               .fcc            = V4L2_PIX_FMT_Z16,
-       },
-       {
-               .name           = "Bayer 10-bit (SRGGB10P)",
-               .guid           = UVC_GUID_FORMAT_RW10,
-               .fcc            = V4L2_PIX_FMT_SRGGB10P,
-       },
 };
 
 /* ------------------------------------------------------------------------

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 7e4d3eea371b64dfab3d2a9126f1c2574dea4089..f0f2391e1b436d7be1916d545421a0091b03bf92 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -119,18 +119,6 @@
 #define UVC_GUID_FORMAT_H264 \
        { 'H',  '2',  '6',  '4', 0x00, 0x00, 0x10, 0x00, \
         0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
-#define UVC_GUID_FORMAT_Y8I \
-       { 'Y',  '8',  'I',  ' ', 0x00, 0x00, 0x10, 0x00, \
-        0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
-#define UVC_GUID_FORMAT_Y12I \
-       { 'Y',  '1',  '2',  'I', 0x00, 0x00, 0x10, 0x00, \
-        0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
-#define UVC_GUID_FORMAT_Z16 \
-       { 'Z',  '1',  '6',  ' ', 0x00, 0x00, 0x10, 0x00, \
-        0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
-#define UVC_GUID_FORMAT_RW10 \
-       { 'R',  'W',  '1',  '0', 0x00, 0x00, 0x10, 0x00, \
-        0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
 
 /* ------------------------------------------------------------------------
  * Driver specific constants.

diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 65f4449dd56e437c97764c1759c14bd4e9b4da70..14cd5ebfee6d40e852b50881826b3e2bb8f1b980 100644 (file)
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -621,9 +621,6 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_JPGL      v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
 #define V4L2_PIX_FMT_SE401      v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */
 #define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3 interleaved UYVY/JPEG */
-#define V4L2_PIX_FMT_Y8I      v4l2_fourcc('Y', '8', 'I', ' ') /* Greyscale 8-bit L/R interleaved */
-#define V4L2_PIX_FMT_Y12I     v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale 12-bit L/R interleaved */
-#define V4L2_PIX_FMT_Z16      v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
 
 /* SDR formats - used only for Software Defined Radio devices */
 #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */