Pull media updates from Mauro Carvalho Chehab: - a major reorg at platform Kconfig/Makefile files, organizing them per vendor. The other media Kconfig/Makefile files also sorted - New sensor drivers: hi847, isl7998x, ov08d10 - New Amphion vpu decoder stateful driver - New Atmel microchip csi2dc driver - tegra-vde driver promoted from staging - atomisp: some fixes for it to work on BYT - imx7-mipi-csis driver promoted from staging and renamed - camss driver got initial support for VFE hardware version Titan 480 - mtk-vcodec has gained support for MT8192 - lots of driver changes, fixes and improvements * tag 'media/v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (417 commits) media: nxp: Restrict VIDEO_IMX_MIPI_CSIS to ARCH_MXC or COMPILE_TEST media: amphion: cleanup media device if register it fail media: amphion: fix some issues to improve robust media: amphion: fix some error related with undefined reference to __divdi3 media: amphion: fix an issue that using pm_runtime_get_sync incorrectly media: vidtv: use vfree() for memory allocated with vzalloc() media: m5mols/m5mols.h: document new reset field media: pixfmt-yuv-planar.rst: fix PIX_FMT labels media: platform: Remove unnecessary print function dev_err() media: amphion: Add missing of_node_put() in vpu_core_parse_dt() media: mtk-vcodec: Add missing of_node_put() in mtk_vdec_hw_prob_done() media: platform: amphion: Fix build error without MAILBOX media: spi: Kconfig: Place SPI drivers on a single menu media: i2c: Kconfig: move camera drivers to the top media: atomisp: fix bad usage at error handling logic media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/ media: media/*/Kconfig: sort entries media: Kconfig: cleanup VIDEO_DEV dependencies media: platform/*/Kconfig: make manufacturer menus more uniform media: platform: Create vendor/{Makefile,Kconfig} files ...
Showing the changes to include/uapi (3 of 883 files). Show all
Unified · Split
| @@ -16,14 +16,16 @@ · 15 unmodified lines | |||
| 16 | #define LIRC_MODE2_PULSE 0x01000000 | 16 | #define LIRC_MODE2_PULSE 0x01000000 |
| 17 | #define LIRC_MODE2_FREQUENCY 0x02000000 | 17 | #define LIRC_MODE2_FREQUENCY 0x02000000 |
| 18 | #define LIRC_MODE2_TIMEOUT 0x03000000 | 18 | #define LIRC_MODE2_TIMEOUT 0x03000000 |
| 19 | #define LIRC_MODE2_OVERFLOW 0x04000000 | ||
| 19 | 20 | ||
| 20 | #define LIRC_VALUE_MASK 0x00FFFFFF | 21 | #define LIRC_VALUE_MASK 0x00FFFFFF |
| 21 | #define LIRC_MODE2_MASK 0xFF000000 | 22 | #define LIRC_MODE2_MASK 0xFF000000 |
| 22 | 23 | ||
| 23 | #define LIRC_SPACE(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_SPACE) | 24 | #define LIRC_SPACE(val) (((val) & LIRC_VALUE_MASK) | LIRC_MODE2_SPACE) |
| 24 | #define LIRC_PULSE(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_PULSE) | 25 | #define LIRC_PULSE(val) (((val) & LIRC_VALUE_MASK) | LIRC_MODE2_PULSE) |
| 25 | #define LIRC_FREQUENCY(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_FREQUENCY) | 26 | #define LIRC_FREQUENCY(val) (((val) & LIRC_VALUE_MASK) | LIRC_MODE2_FREQUENCY) |
| 26 | #define LIRC_TIMEOUT(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_TIMEOUT) | 27 | #define LIRC_TIMEOUT(val) (((val) & LIRC_VALUE_MASK) | LIRC_MODE2_TIMEOUT) |
| 28 | #define LIRC_OVERFLOW(val) (((val) & LIRC_VALUE_MASK) | LIRC_MODE2_OVERFLOW) | ||
| 27 | 29 | ||
| 28 | #define LIRC_VALUE(val) ((val)&LIRC_VALUE_MASK) | 30 | #define LIRC_VALUE(val) ((val)&LIRC_VALUE_MASK) |
| 29 | #define LIRC_MODE2(val) ((val)&LIRC_MODE2_MASK) | 31 | #define LIRC_MODE2(val) ((val)&LIRC_MODE2_MASK) |
| @@ -32,6 +34,7 @@ · 2 unmodified lines | |||
| 32 | #define LIRC_IS_PULSE(val) (LIRC_MODE2(val) == LIRC_MODE2_PULSE) | 34 | #define LIRC_IS_PULSE(val) (LIRC_MODE2(val) == LIRC_MODE2_PULSE) |
| 33 | #define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY) | 35 | #define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY) |
| 34 | #define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT) | 36 | #define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT) |
| 37 | #define LIRC_IS_OVERFLOW(val) (LIRC_MODE2(val) == LIRC_MODE2_OVERFLOW) | ||
| 35 | 38 | ||
| 36 | /* used heavily by lirc userspace */ | 39 | /* used heavily by lirc userspace */ |
| 37 | #define lirc_t int | 40 | #define lirc_t int |
| @@ -70,13 +73,10 @@ · 32 unmodified lines | |||
| 70 | #define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK) | 73 | #define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK) |
| 71 | 74 | ||
| 72 | #define LIRC_CAN_SET_REC_CARRIER (LIRC_CAN_SET_SEND_CARRIER << 16) | 75 | #define LIRC_CAN_SET_REC_CARRIER (LIRC_CAN_SET_SEND_CARRIER << 16) |
| 73 | #define LIRC_CAN_SET_REC_DUTY_CYCLE (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16) | ||
| 74 | 76 | ||
| 75 | #define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000 | ||
| 76 | #define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000 | 77 | #define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000 |
| 77 | #define LIRC_CAN_GET_REC_RESOLUTION 0x20000000 | 78 | #define LIRC_CAN_GET_REC_RESOLUTION 0x20000000 |
| 78 | #define LIRC_CAN_SET_REC_TIMEOUT 0x10000000 | 79 | #define LIRC_CAN_SET_REC_TIMEOUT 0x10000000 |
| 79 | #define LIRC_CAN_SET_REC_FILTER 0x08000000 | ||
| 80 | 80 | ||
| 81 | #define LIRC_CAN_MEASURE_CARRIER 0x02000000 | 81 | #define LIRC_CAN_MEASURE_CARRIER 0x02000000 |
| 82 | #define LIRC_CAN_USE_WIDEBAND_RECEIVER 0x04000000 | 82 | #define LIRC_CAN_USE_WIDEBAND_RECEIVER 0x04000000 |
| @@ -84,8 +84,6 @@ · 1 unmodified line | |||
| 84 | #define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK) | 84 | #define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK) |
| 85 | #define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK) | 85 | #define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK) |
| 86 | 86 | ||
| 87 | #define LIRC_CAN_NOTIFY_DECODE 0x01000000 | ||
| 88 | |||
| 89 | /*** IOCTL commands for lirc driver ***/ | 87 | /*** IOCTL commands for lirc driver ***/ |
| 90 | 88 | ||
| 91 | #define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32) | 89 | #define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32) |
| @@ -219,6 +219,12 @@ enum v4l2_colorfx { · 218 unmodified lines | |||
| 219 | */ | 219 | */ |
| 220 | #define V4L2_CID_USER_ALLEGRO_BASE (V4L2_CID_USER_BASE + 0x1170) | 220 | #define V4L2_CID_USER_ALLEGRO_BASE (V4L2_CID_USER_BASE + 0x1170) |
| 221 | 221 | ||
| 222 | /* | ||
| 223 | * The base for the isl7998x driver controls. | ||
| 224 | * We reserve 16 controls for this driver. | ||
| 225 | */ | ||
| 226 | #define V4L2_CID_USER_ISL7998X_BASE (V4L2_CID_USER_BASE + 0x1180) | ||
| 227 | |||
| 222 | /* MPEG-class control IDs */ | 228 | /* MPEG-class control IDs */ |
| 223 | /* The MPEG controls are applicable to all codec controls | 229 | /* The MPEG controls are applicable to all codec controls |
| 224 | * and the 'MPEG' part of the define is historical */ | 230 | * and the 'MPEG' part of the define is historical */ |
| @@ -1563,6 +1569,8 @@ struct v4l2_h264_dpb_entry { · 1338 unmodified lines | |||
| 1563 | #define V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC 0x01 | 1569 | #define V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC 0x01 |
| 1564 | #define V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC 0x02 | 1570 | #define V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC 0x02 |
| 1565 | #define V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD 0x04 | 1571 | #define V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD 0x04 |
| 1572 | #define V4L2_H264_DECODE_PARAM_FLAG_PFRAME 0x08 | ||
| 1573 | #define V4L2_H264_DECODE_PARAM_FLAG_BFRAME 0x10 | ||
| 1566 | 1574 | ||
| 1567 | #define V4L2_CID_STATELESS_H264_DECODE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 7) | 1575 | #define V4L2_CID_STATELESS_H264_DECODE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 7) |
| 1568 | /** | 1576 | /** |
| @@ -632,6 +632,8 @@ struct v4l2_pix_format { · 631 unmodified lines | |||
| 632 | /* Tiled YUV formats, non contiguous planes */ | 632 | /* Tiled YUV formats, non contiguous planes */ |
| 633 | #define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 tiles */ | 633 | #define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 tiles */ |
| 634 | #define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 tiles */ | 634 | #define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 tiles */ |
| 635 | #define V4L2_PIX_FMT_NV12M_8L128 v4l2_fourcc('N', 'A', '1', '2') /* Y/CbCr 4:2:0 8x128 tiles */ | ||
| 636 | #define V4L2_PIX_FMT_NV12M_10BE_8L128 v4l2_fourcc_be('N', 'T', '1', '2') /* Y/CbCr 4:2:0 10-bit 8x128 tiles */ | ||
| 635 | 637 | ||
| 636 | /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ | 638 | /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ |
| 637 | #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ | 639 | #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ |