forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'c4c06227b0'

Browse source 
* commit 'c4c06227b0':
  media: rockchip: isp: add RKISP_CMD_SET_TB_HEAD_V32 API
  clk: rockchip: rv1106: optimize calibrate step for cru pvtpll
  ARM: rockchip: rv1106_pm: optimize pvtpll save/restore process flow
  UPSTREAM: gpio: rockchip: Reset int_bothedge when changing trigger
  ARM: dts: rockchip: rv1106-evb-dual-cam add sc530ai
  media: rockchip: isp: fix mp wrap buf from rockit no output
  mfd: display-serdes: fix building error

Change-Id: Ifa823804017620c5297d002598dc87a3388e2dcd
This commit is contained in:
Tao Huang 2024-02-29 18:21:46 +08:00
commit b70dfeba02
9 changed files with 135 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/uapi/linux/rk-isp2-config.h
View file

@ -52,6 +52,7 @@
_IOW('V', BASE_VIDIOC_PRIVATE + 11, long long)
/* BASE_VIDIOC_PRIVATE + 12 for RKISP_CMD_GET_TB_HEAD_V32 */
/* BASE_VIDIOC_PRIVATE + 14 for RKISP_CMD_SET_TB_HEAD_V32 */
/* for all isp device stop and no power off but resolution change */
#define RKISP_CMD_MULTI_DEV_FORCE_ENUM \

3
include/uapi/linux/rk-isp32-config.h
View file

@ -14,6 +14,9 @@
#define RKISP_CMD_GET_TB_HEAD_V32 \
_IOR('V', BASE_VIDIOC_PRIVATE + 12, struct rkisp32_thunderboot_resmem_head)
#define RKISP_CMD_SET_TB_HEAD_V32 \
_IOW('V', BASE_VIDIOC_PRIVATE + 14, struct rkisp32_thunderboot_resmem_head)
#define ISP32_MODULE_DPCC ISP3X_MODULE_DPCC
#define ISP32_MODULE_BLS ISP3X_MODULE_BLS
#define ISP32_MODULE_SDG ISP3X_MODULE_SDG