Pull media updates from Mauro Carvalho Chehab: - remove of atomisp driver from staging, as nobody would have time to dedicate huge efforts to fix all the problems there. Also, we have a feeling that the driver may not even run the way it is. - move Zoran driver to staging, in order to be either fixed to use VB2 and the proper media kAPIs or to be removed - remove videobuf-dvb driver, with is unused for a while - some V4L2 documentation fixes/improvements - new sensor drivers: imx258 and ov7251 - a new driver was added to allow using I2C transparent drivers - several improvements at the ddbridge driver - several improvements at the ISDB pt1 driver, making it more coherent with the DVB framework - added a new platform driver for MIPI CSI-2 RX: cadence - now, all media drivers can be compiled on x86 with COMPILE_TEST - almost all media drivers now build on non-x86 architectures with COMPILE_TEST - lots of other random stuff: cleanups, support for new board models, bug fixes, etc * tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits) media: omap2: fix compile-testing with FB_OMAP2=m media: media/radio/Kconfig: add back RADIO_ISA media: v4l2-ioctl.c: fix missing unlock in __video_do_ioctl() media: pxa_camera: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power media: arch: sh: migor: Fix TW9910 PDN gpio media: staging: tegra-vde: Reset VDE regardless of memory client resetting failure media: marvel-ccic: mmp: select VIDEOBUF2_VMALLOC/DMA_CONTIG media: marvel-ccic: allow ccic and mmp drivers to coexist media: uvcvideo: Prevent setting unavailable flags media: ddbridge: conditionally enable fast TS for stv0910-equipped bridges media: dvb-frontends/stv0910: make TS speed configurable media: ddbridge/mci: add identifiers to function definition arguments media: ddbridge/mci: protect against out-of-bounds array access in stop() media: rc: ensure input/lirc device can be opened after register media: rc: nuvoton: Keep device enabled during reg init media: rc: nuvoton: Keep track of users on CIR enable/disable media: rc: nuvoton: Tweak the interrupt enabling dance media: uvcvideo: Support realtek's UVC 1.5 device media: uvcvideo: Fix driver reference counting media: gspca_zc3xx: Enable short exposure times for OV7648 ...
Showing the changes to include/uapi (2 of 1168 files). Show all
Unified · Split
| @@ -133,6 +133,12 @@ · 132 unmodified lines | ||
| 133 | 133 | |
| 134 | 134 | #define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32) |
| 135 | 135 | |
| 136 | +/* | |
| 137 | + * Return the recording timeout, which is either set by | |
| 138 | + * the ioctl LIRC_SET_REC_TIMEOUT or by the kernel after setting the protocols. | |
| 139 | + */ | |
| 140 | +#define LIRC_GET_REC_TIMEOUT _IOR('i', 0x00000024, __u32) | |
| 141 | + | |
| 136 | 142 | /* |
| 137 | 143 | * struct lirc_scancode - decoded scancode with protocol for use with |
| 138 | 144 | * LIRC_MODE_SCANCODE |
| @@ -55,6 +55,8 @@ · 54 unmodified lines | ||
| 55 | 55 | _IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct omap3isp_h3a_af_config) |
| 56 | 56 | #define VIDIOC_OMAP3ISP_STAT_REQ \ |
| 57 | 57 | _IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct omap3isp_stat_data) |
| 58 | +#define VIDIOC_OMAP3ISP_STAT_REQ_TIME32 \ | |
| 59 | + _IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct omap3isp_stat_data_time32) | |
| 58 | 60 | #define VIDIOC_OMAP3ISP_STAT_EN \ |
| 59 | 61 | _IOWR('V', BASE_VIDIOC_PRIVATE + 7, unsigned long) |
| 60 | 62 | |
| @@ -165,7 +167,14 @@ struct omap3isp_h3a_aewb_config { · 104 unmodified lines | ||
| 165 | 167 | * @config_counter: Number of the configuration associated with the data. |
| 166 | 168 | */ |
| 167 | 169 | struct omap3isp_stat_data { |
| 170 | +#ifdef __KERNEL__ | |
| 171 | + struct { | |
| 172 | + __s64 tv_sec; | |
| 173 | + __s64 tv_usec; | |
| 174 | + } ts; | |
| 175 | +#else | |
| 168 | 176 | struct timeval ts; |
| 177 | +#endif | |
| 169 | 178 | void __user *buf; |
| 170 | 179 | __u32 buf_size; |
| 171 | 180 | __u16 frame_number; |
| @@ -173,6 +182,19 @@ struct omap3isp_stat_data { · 1 unmodified line | ||
| 173 | 182 | __u16 config_counter; |
| 174 | 183 | }; |
| 175 | 184 | |
| 185 | +#ifdef __KERNEL__ | |
| 186 | +struct omap3isp_stat_data_time32 { | |
| 187 | + struct { | |
| 188 | + __s32 tv_sec; | |
| 189 | + __s32 tv_usec; | |
| 190 | + } ts; | |
| 191 | + __u32 buf; | |
| 192 | + __u32 buf_size; | |
| 193 | + __u16 frame_number; | |
| 194 | + __u16 cur_frame; | |
| 195 | + __u16 config_counter; | |
| 196 | +}; | |
| 197 | +#endif | |
| 176 | 198 | |
| 177 | 199 | /* Histogram related structs */ |
| 178 | 200 | |