Merge commit '243363ccfdc2f2ed3be8e210d1687d7a8b14a97a'

* commit '243363ccfdc2f2ed3be8e210d1687d7a8b14a97a':
  misc: rockchip: pcie-rkep: Remove redundancy vm_flags
  media: i2c: add support sc485sl sensor driver
  media: i2c: add support os04e10 sensor driver for v6.1
  media: rockchip: vicap support get error info
  include: rk-camera-module: add cmd RKMODULE_GET_ERROR_INFO
  arm64: dts: rockchip: rv1126b-evb1-v10&rv1126b-evb2-v10: enable low power aoa
  dt-bindings: suspend: add RKPM_SLP_LP_AOA macro for rv1126b
  video: rockchip: rga3: fix error of using DMA_MAPPING_ERROR directly
  video: rockchip: rga3: fix image size cal error in BPP format
  arm64: dts: rockchip: Remove property support-psr of eDP nodes
  drm/rockchip: Move the init/cleanup of self refresh helper from VOP/VOP2 to eDP/RGB drivers
  drm/rockchip: vop: Add errno if &vop->lut memory allocation failed in vop_create_crtc()
  drm/bridge: analogix_dp: Add &analogix_dp_plat_data.disable_psr to check whether to disable PSR
  PCI: rockchip: dw-dmatest: Fix compile warning

Change-Id: I2fec17a7e13f8f317b5bf767ccb53b800c3b1625
This commit is contained in:
Tao Huang
2025-07-30 20:03:20 +08:00
26 changed files with 5980 additions and 46 deletions

View File

@@ -229,6 +229,9 @@
#define RKMODULE_SET_CMPS_MODE \
_IOW('V', BASE_VIDIOC_PRIVATE + 55, __u32)
#define RKMODULE_GET_ERROR_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 56, struct rkmodule_error_info)
struct rkmodule_i2cdev_info {
__u8 slave_addr;
} __attribute__ ((packed));
@@ -987,4 +990,9 @@ enum rkmodule_cmps_mode {
CMPS_HIGH_BIT_WIDTH_MODE,
};
struct rkmodule_error_info {
__u32 err_code;
__u8 detail[256];
};
#endif /* _UAPI_RKMODULE_CAMERA_H */