Merge commit 'e6b572efcc8febc5467ee764fbef1f6b316c7806'

* commit 'e6b572efcc8febc5467ee764fbef1f6b316c7806':
  drm/rockchip: vop2: Do not clear wb intr status when commit new wb
  drm/rockchip: vop2: Do not commit writeback when all win disabled
  drm/rockchip: vop2: Remove redundant writeback cleanup
  drm/rockchip: vop2: enable writeback complete interrupt for rk3576
  include: rk-camera-module: add cmd RKMODULE_SET_CHANNEL_STREAM
  include: rk-camera-module: add cmd RKMODULE_SET_CHANNEL_POWER
  media: rockchip: isp: fix 3a error for multi sensor only vpss output
  arm64: dts: rockchip: add rv1126b-evb1-v11-dual-cam dts
  ARM: configs: add rv1126b-rk628 configuration
  media: i2c: rk628: fix debugfs NULL parameter

Change-Id: Ifa55805a48d90272b41430120453f0702b049fb5
This commit is contained in:
Tao Huang
2025-08-08 18:01:57 +08:00
10 changed files with 116 additions and 24 deletions

View File

@@ -250,6 +250,12 @@
#define RKMODULE_GET_HDR_COMPR_SINGLE_FRAME_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 62, struct rkmodule_hdr_compr_single_frame_info)
#define RKMODULE_SET_CHANNEL_POWER \
_IOW('V', BASE_VIDIOC_PRIVATE + 63, struct rkmodule_channel_power)
#define RKMODULE_SET_CHANNEL_STREAM \
_IOW('x', 0, struct rkmodule_channel_stream)
#define RKMODULE_REG_LIST_MAX (16)
struct rkmodule_reg_struct {
__u32 reg_addr;
@@ -1086,4 +1092,14 @@ struct rkmodule_hdr_compr_single_frame_info {
__u32 reserved[8];
};
struct rkmodule_channel_power {
__u32 channel;
__u32 enable;
};
struct rkmodule_channel_stream {
__u32 channel;
__u32 enable;
};
#endif /* _UAPI_RKMODULE_CAMERA_H */