Pull media updates from Mauro Carvalho Chehab: - New staging driver for Rockship ISPv1 unit - New staging driver for Rockchip MIPI Synopsys DPHY RX0 - y2038 fixes at V4L2 API (backward-compatible) - A dvb core fix when receiving invalid EIT sections - Some clang-specific warnings got fixed - Added support for touch V4L2 interface at vivid - Several drivers were converted to use the new i2c_new_scanned_device() kAPI - Added sm1 support at meson's vdec driver - Several other driver cleanups, fixes and improvements * tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (207 commits) media: staging/intel-ipu3: remove TODO item about acronyms media: v4l2-fwnode: Print the node name while parsing endpoints media: Revert "media: staging/intel-ipu3: make imgu use fixed running mode" media: mt9v111: constify copied structure media: platform: VIDEO_MEDIATEK_JPEG can also depend on MTK_IOMMU media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors media: hantro: fix post-processing NULL pointer dereference media: rcar-vin: Use correct pixel format when aligning format media: MAINTAINERS: add entry for Rockchip ISP1 driver media: staging: rkisp1: add TODO file for staging media: staging: rkisp1: add document for rkisp1 meta buffer format media: staging: rkisp1: add output device for parameters media: staging: rkisp1: add capture device for statistics media: staging: rkisp1: add user space ABI definitions media: staging: rkisp1: add streaming paths media: staging: rkisp1: add Rockchip ISP1 base driver media: staging: phy-rockchip-dphy-rx0: add Rockchip MIPI Synopsys DPHY RX0 driver media: staging: dt-bindings: add Rockchip MIPI RX D-PHY RX0 yaml bindings media: staging: dt-bindings: add Rockchip ISP1 yaml bindings ...
Showing the changes to include/uapi/linux (1 of 215 files). Show all
Unified · Split
| @@ -912,6 +912,25 @@ struct v4l2_jpegcompression { · 911 unmodified lines | ||
| 912 | 912 | /* |
| 913 | 913 | * M E M O R Y - M A P P I N G B U F F E R S |
| 914 | 914 | */ |
| 915 | + | |
| 916 | +#ifdef __KERNEL__ | |
| 917 | +/* | |
| 918 | + * This corresponds to the user space version of timeval | |
| 919 | + * for 64-bit time_t. sparc64 is different from everyone | |
| 920 | + * else, using the microseconds in the wrong half of the | |
| 921 | + * second 64-bit word. | |
| 922 | + */ | |
| 923 | +struct __kernel_v4l2_timeval { | |
| 924 | + long long tv_sec; | |
| 925 | +#if defined(__sparc__) && defined(__arch64__) | |
| 926 | + int tv_usec; | |
| 927 | + int __pad; | |
| 928 | +#else | |
| 929 | + long long tv_usec; | |
| 930 | +#endif | |
| 931 | +}; | |
| 932 | +#endif | |
| 933 | + | |
| 915 | 934 | struct v4l2_requestbuffers { |
| 916 | 935 | __u32 count; |
| 917 | 936 | __u32 type; /* enum v4l2_buf_type */ |
| @@ -997,7 +1016,11 @@ struct v4l2_buffer { · 79 unmodified lines | ||
| 997 | 1016 | __u32 bytesused; |
| 998 | 1017 | __u32 flags; |
| 999 | 1018 | __u32 field; |
| 1019 | +#ifdef __KERNEL__ | |
| 1020 | + struct __kernel_v4l2_timeval timestamp; | |
| 1021 | +#else | |
| 1000 | 1022 | struct timeval timestamp; |
| 1023 | +#endif | |
| 1001 | 1024 | struct v4l2_timecode timecode; |
| 1002 | 1025 | __u32 sequence; |
| 1003 | 1026 | |
| @@ -1017,6 +1040,7 @@ struct v4l2_buffer { · 13 unmodified lines | ||
| 1017 | 1040 | }; |
| 1018 | 1041 | }; |
| 1019 | 1042 | |
| 1043 | +#ifndef __KERNEL__ | |
| 1020 | 1044 | /** |
| 1021 | 1045 | * v4l2_timeval_to_ns - Convert timeval to nanoseconds |
| 1022 | 1046 | * @ts: pointer to the timeval variable to be converted |
| @@ -1028,6 +1052,7 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv) · 5 unmodified lines | ||
| 1028 | 1052 | { |
| 1029 | 1053 | return (__u64)tv->tv_sec * 1000000000ULL + tv->tv_usec * 1000; |
| 1030 | 1054 | } |
| 1055 | +#endif | |
| 1031 | 1056 | |
| 1032 | 1057 | /* Flags for 'flags' field */ |
| 1033 | 1058 | /* Buffer is mapped (flag) */ |
| @@ -2339,7 +2364,11 @@ struct v4l2_event { · 1305 unmodified lines | ||
| 2339 | 2364 | } u; |
| 2340 | 2365 | __u32 pending; |
| 2341 | 2366 | __u32 sequence; |
| 2367 | +#ifdef __KERNEL__ | |
| 2368 | + struct __kernel_timespec timestamp; | |
| 2369 | +#else | |
| 2342 | 2370 | struct timespec timestamp; |
| 2371 | +#endif | |
| 2343 | 2372 | __u32 id; |
| 2344 | 2373 | __u32 reserved[8]; |
| 2345 | 2374 | }; |