shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3d712791cdfaf3011a49ac70dca4fd25febec256'

Browse Source 
* commit '3d712791cdfaf3011a49ac70dca4fd25febec256': (28 commits)
  media: rockchip: isp: add iommu fault handler
  drm/rockchip: vop2: Fix error handling for get dclk_src
  arm64: dts: rockchip: rk3576-rk806: Changing the implementation of pin functions
  arm64: dts: rockchip: rk3588-rk806: Changing the implementation of pin functions
  regulator: rk806: Modify the implementation of RK806 shutdown
  ARM: configs: rv1126b-aoa.config: Add config and enable ROCKCHIP_AOA_MIDDLEWARE with module
  arm64: dts: rockchip: rv1126b-evb: enable AOA features
  arm64: dts: rockchip: rv1126b-aoa: Add aoa_middleware node and enable related modules for AOA feature
  arm64: dts: rockchip: rv1126b: Add aoa/dma-lp/aoa_mmap/aoa_sram for AOA feature
  soc: rockchip: aoa_middleware: Add support AOA middleware modules
  media: rockchip: isp: fix unite div calculation
  media: spi: add ms41908 and ms41968
  include: rk_vcm_head: add zoom1 field
  include: uapi: rk-camera-module.h add more exp_mode of lofic
  media: i2c: ox03c10 support get single frame info of hdr_compr
  include: uapi: rk-camera-module.h add cmd RKMODULE_GET_HDR_COMPR_SINGLE_FRAME_INFO
  include: uapi: rk-camera-module.h add cmd RKMODULE_SET_BAYER_MODE
  media: i2c: ox03c10 add more control of blc
  include: uapi: rk-camera-module.h: RKMODULE_SET_BLC add more param
  media: i2c: ox03c10 support set reg_setting config
  ...

Change-Id: Iff99fdadff16fe12a21a46dae18465c851911160
This commit is contained in:
Tao Huang
2025-07-31 19:20:11 +08:00
parent adba0087dd 3d712791cd
commit 0c93f826d9
31 changed files with 8198 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
include/uapi/linux/rk-camera-module.h
View File

@@ -232,6 +232,30 @@
#define RKMODULE_GET_ERROR_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 56, struct rkmodule_error_info)
#define RKMODULE_SET_EXPAND_SINGLE_MODE \
_IOW('V', BASE_VIDIOC_PRIVATE + 57, __u32)
#define RKMODULE_SET_LENC \
_IOW('V', BASE_VIDIOC_PRIVATE + 58, struct rkmodule_lenc_gain)
#define RKMODULE_GET_LENC_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 59, struct rkmodule_lenc_info)
#define RKMODULE_SET_REG_SETTING \
_IOW('V', BASE_VIDIOC_PRIVATE + 60, struct rkmodule_reg_setting)
#define RKMODULE_SET_BAYER_MODE \
_IOW('V', BASE_VIDIOC_PRIVATE + 61, struct rkmodule_bayer_param)
#define RKMODULE_GET_HDR_COMPR_SINGLE_FRAME_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 62, struct rkmodule_hdr_compr_single_frame_info)
#define RKMODULE_REG_LIST_MAX (16)
struct rkmodule_reg_struct {
__u32 reg_addr;
__u32 reg_val;
};
struct rkmodule_i2cdev_info {
__u8 slave_addr;
} __attribute__ ((packed));
@@ -537,6 +561,8 @@ enum exp_mode_e {
EXP_HDR3_DCG_VS,
EXP_HDR3_DCG_SPD,
EXP_HDR3_STA,
EXP_HDR3_DCG_LOFIC,
EXP_HDR3_LCG_LOFIC_VS,
};
struct rkmodule_hdr_cfg {
@@ -964,9 +990,15 @@ enum rkmodule_blc_type {
};
struct rkmodule_blc_group {
__u32 enable;
__u32 group_num;
enum rkmodule_blc_type blc_type[RKMODULE_MAX_BLC_GROUP];
__u32 blc[RKMODULE_MAX_BLC_GROUP];
__u32 bkdg_sw_en;
__u32 dgbk2bkdg_thred;
__u32 bkdg2dgbk_thred;
__u32 reg_num;
struct rkmodule_reg_struct reg_list[RKMODULE_REG_LIST_MAX];
};
enum rkmodule_bayer_mode {
@@ -995,4 +1027,63 @@ struct rkmodule_error_info {
__u8 detail[256];
};
enum rkmodule_expand_single_mode {
EXPAND_SINGLE_LCG,
EXPAND_SINGLE_HCG,
EXPAND_SINGLE_VS,
EXPAND_SINGLE_SPD,
EXPAND_SINGLE_LOFIC,
};
#define RKMODULE_MAX_LENC_GROUP (4)
struct rkmodule_lenc_gain {
__u32 g[RKMODULE_LSCDATA_LEN];
__u32 b[RKMODULE_LSCDATA_LEN];
__u32 r[RKMODULE_LSCDATA_LEN];
};
struct rkmodule_lenc_data {
__u16 rgain;
__u16 bgain;
struct rkmodule_lenc_gain lenc_gain;
};
struct rkmodule_lenc_inf {
__u32 flag;
__u32 group_num;
__u32 lenc_gain_len;
struct rkmodule_lenc_data lenc_data[RKMODULE_MAX_LENC_GROUP];
};
struct rkmodule_lenc_info {
__u32 bit_width;
__u32 grid_num;
__u32 reserved[8];
};
enum rkmodule_binning_mode {
BAYER_BINNING_2X2,
BAYER_SKIP_2X2,
QBC_BINNING_2X2,
};
struct rkmodule_reg_setting {
__u32 setting_id;
__u32 binning_mode;
__u32 reg_num;
struct rkmodule_reg_struct reg_list[RKMODULE_REG_LIST_MAX];
};
struct rkmodule_bayer_param {
__u32 bayer_mode;
__u32 reg_num;
struct rkmodule_reg_struct reg_list[RKMODULE_REG_LIST_MAX];
};
struct rkmodule_hdr_compr_single_frame_info {
__u32 single_bitwidth;
__u32 reserved[8];
};
#endif /* _UAPI_RKMODULE_CAMERA_H */

2
include/uapi/linux/rk_vcm_head.h
View File

@@ -100,11 +100,13 @@ struct rk_cam_set_focus {
struct rk_cam_zoom_pos {
__s32 zoom_pos;
__s32 zoom1_pos;
__s32 focus_pos;
};
struct rk_cam_set_zoom {
_Bool is_need_zoom_reback;
_Bool is_need_zoom1_reback;
_Bool is_need_focus_reback;
__u32 setzoom_cnt;
struct rk_cam_zoom_pos zoom_pos[VCMDRV_SETZOOM_MAXCNT];