Pull media updates from Mauro Carvalho Chehab: - New sensor driver: imx219 - Support for some new pixelformats - Support for Sun8i SoC - Added more codecs to meson vdec driver - Prepare for removing the legacy usbvision driver by moving it to staging. This driver has issues and use legacy core APIs. If nobody steps up to address those, it is time for its retirement. - Several cleanups and improvements on drivers, with the addition of new supported boards * tag 'media/v5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (236 commits) media: venus: firmware: Ignore secure call error on first resume media: mtk-vpu: load vpu firmware from the new location media: i2c: video-i2c: fix build errors due to 'imply hwmon' media: MAINTAINERS: add myself to co-maintain Hantro G1/G2 for i.MX8MQ media: hantro: add initial i.MX8MQ support media: dt-bindings: Document i.MX8MQ VPU bindings media: vivid: fix incorrect PA assignment to HDMI outputs media: hantro: Add linux-rockchip mailing list to MAINTAINERS media: cedrus: h264: Fix 4K decoding on H6 media: siano: Use scnprintf() for avoiding potential buffer overflow media: rc: Use scnprintf() for avoiding potential buffer overflow media: allegro: create new struct for channel parameters media: allegro: move mail definitions to separate file media: allegro: pass buffers through firmware media: allegro: verify source and destination buffer in VCU response media: allegro: handle dependency of bitrate and bitrate_peak media: allegro: read bitrate mode directly from control media: allegro: make QP configurable media: allegro: make frame rate configurable media: allegro: skip filler data if possible ...
Showing the changes to include/uapi/linux (3 of 343 files). Show all
Unified · Split
| @@ -64,7 +64,7 @@ · 63 unmodified lines | ||
| 64 | 64 | #define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 |
| 65 | 65 | #define MEDIA_BUS_FMT_RGB161616_1X48 0x101a |
| 66 | 66 | |
| 67 | −/* YUV (including grey) - next is 0x202d */ | |
| 67 | +/* YUV (including grey) - next is 0x202e */ | |
| 68 | 68 | #define MEDIA_BUS_FMT_Y8_1X8 0x2001 |
| 69 | 69 | #define MEDIA_BUS_FMT_UV8_1X8 0x2015 |
| 70 | 70 | #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 |
| @@ -86,6 +86,7 @@ · 15 unmodified lines | ||
| 86 | 86 | #define MEDIA_BUS_FMT_VYUY12_2X12 0x201d |
| 87 | 87 | #define MEDIA_BUS_FMT_YUYV12_2X12 0x201e |
| 88 | 88 | #define MEDIA_BUS_FMT_YVYU12_2X12 0x201f |
| 89 | +#define MEDIA_BUS_FMT_Y14_1X14 0x202d | |
| 89 | 90 | #define MEDIA_BUS_FMT_UYVY8_1X16 0x200f |
| 90 | 91 | #define MEDIA_BUS_FMT_VYUY8_1X16 0x2010 |
| 91 | 92 | #define MEDIA_BUS_FMT_YUYV8_1X16 0x2011 |
| @@ -192,6 +192,12 @@ enum v4l2_colorfx { · 191 unmodified lines | ||
| 192 | 192 | * We reserve 16 controls for this driver. */ |
| 193 | 193 | #define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0) |
| 194 | 194 | |
| 195 | +/* | |
| 196 | + * The base for the atmel isc driver controls. | |
| 197 | + * We reserve 32 controls for this driver. | |
| 198 | + */ | |
| 199 | +#define V4L2_CID_USER_ATMEL_ISC_BASE (V4L2_CID_USER_BASE + 0x10c0) | |
| 200 | + | |
| 195 | 201 | /* MPEG-class control IDs */ |
| 196 | 202 | /* The MPEG controls are applicable to all codec controls |
| 197 | 203 | * and the 'MPEG' part of the define is historical */ |
| @@ -565,6 +565,7 @@ struct v4l2_pix_format { · 564 unmodified lines | ||
| 565 | 565 | #define V4L2_PIX_FMT_Y6 v4l2_fourcc('Y', '0', '6', ' ') /* 6 Greyscale */ |
| 566 | 566 | #define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ') /* 10 Greyscale */ |
| 567 | 567 | #define V4L2_PIX_FMT_Y12 v4l2_fourcc('Y', '1', '2', ' ') /* 12 Greyscale */ |
| 568 | +#define V4L2_PIX_FMT_Y14 v4l2_fourcc('Y', '1', '4', ' ') /* 14 Greyscale */ | |
| 568 | 569 | #define V4L2_PIX_FMT_Y16 v4l2_fourcc('Y', '1', '6', ' ') /* 16 Greyscale */ |
| 569 | 570 | #define V4L2_PIX_FMT_Y16_BE v4l2_fourcc_be('Y', '1', '6', ' ') /* 16 Greyscale BE */ |
| 570 | 571 | |
| @@ -662,6 +663,10 @@ struct v4l2_pix_format { · 91 unmodified lines | ||
| 662 | 663 | #define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C') |
| 663 | 664 | #define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C') |
| 664 | 665 | #define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C') |
| 666 | +#define V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14 BGBG.. GRGR.. */ | |
| 667 | +#define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14 GBGB.. RGRG.. */ | |
| 668 | +#define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('G', 'R', '1', '4') /* 14 GRGR.. BGBG.. */ | |
| 669 | +#define V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') /* 14 RGRG.. GBGB.. */ | |
| 665 | 670 | /* 14bit raw bayer packed, 7 bytes for every 4 pixels */ |
| 666 | 671 | #define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E') |
| 667 | 672 | #define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E') |
| @@ -1242,6 +1247,10 @@ struct v4l2_selection { · 574 unmodified lines | ||
| 1242 | 1247 | |
| 1243 | 1248 | typedef __u64 v4l2_std_id; |
| 1244 | 1249 | |
| 1250 | +/* | |
| 1251 | + * Attention: Keep the V4L2_STD_* bit definitions in sync with | |
| 1252 | + * include/dt-bindings/display/sdtv-standards.h SDTV_STD_* bit definitions. | |
| 1253 | + */ | |
| 1245 | 1254 | /* one bit for each */ |
| 1246 | 1255 | #define V4L2_STD_PAL_B ((v4l2_std_id)0x00000001) |
| 1247 | 1256 | #define V4L2_STD_PAL_B1 ((v4l2_std_id)0x00000002) |