From d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 02:45:28 +0000
Subject: [PATCH] add boot partition size
---
kernel/include/uapi/linux/rk_vcm_head.h | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/kernel/include/uapi/linux/rk_vcm_head.h b/kernel/include/uapi/linux/rk_vcm_head.h
index 4969b08..4e663ae 100644
--- a/kernel/include/uapi/linux/rk_vcm_head.h
+++ b/kernel/include/uapi/linux/rk_vcm_head.h
@@ -4,6 +4,9 @@
#ifndef RK_VCM_HEAD_H
#define RK_VCM_HEAD_H
+#include <linux/types.h>
+#include <linux/time_types.h>
+
#define RK_VCM_HEAD_VERSION KERNEL_VERSION(0, 0x02, 0x0)
/*
* Focus position values:
@@ -11,6 +14,7 @@
* where 64 is the setting for infinity and 0 for macro
*/
#define VCMDRV_MAX_LOG 64U
+#define VCMDRV_SETZOOM_MAXCNT 300U
#define OF_CAMERA_VCMDRV_MAX_CURRENT "rockchip,vcm-max-current"
#define OF_CAMERA_VCMDRV_START_CURRENT "rockchip,vcm-start-current"
@@ -19,7 +23,17 @@
#define OF_CAMERA_VCMDRV_DLC_ENABLE "rockchip,vcm-dlc-enable"
#define OF_CAMERA_VCMDRV_MCLK "rockchip,vcm-mclk"
#define OF_CAMERA_VCMDRV_T_SRC "rockchip,vcm-t-src"
-#define VCMDRV_SETZOOM_MAXCNT 300U
+#define OF_CAMERA_VCMDRV_T_DIV "rockchip,vcm-t-div"
+#define OF_CAMERA_VCMDRV_ADVANCED_MODE "rockchip,vcm-adcanced-mode"
+#define OF_CAMERA_VCMDRV_SAC_MODE "rockchip,vcm-sac-mode"
+#define OF_CAMERA_VCMDRV_SAC_TIME "rockchip,vcm-sac-time"
+#define OF_CAMERA_VCMDRV_PRESC "rockchip,vcm-prescl"
+#define OF_CAMERA_VCMDRV_NRC_EN "rockchip,vcm-nrc-en"
+#define OF_CAMERA_VCMDRV_NRC_MODE "rockchip,vcm-nrc-mode"
+#define OF_CAMERA_VCMDRV_NRC_PRESET "rockchip,vcm-nrc-preset"
+#define OF_CAMERA_VCMDRV_NRC_INFL "rockchip,vcm-nrc-infl"
+#define OF_CAMERA_VCMDRV_NRC_TIME "rockchip,vcm-nrc-time"
+#define VCMDRV_SETZOOM_MAXCNT 300U
#define RK_VIDIOC_VCM_TIMEINFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 0, struct rk_cam_vcm_tim)
@@ -61,7 +75,9 @@
#define RK_VIDIOC_MODIFY_POSITION \
_IOW('V', BASE_VIDIOC_PRIVATE + 16, struct rk_cam_modify_pos)
-#ifdef CONFIG_COMPAT
+#define RK_VIDIOC_SET_VCM_MAX_LOGICALPOS \
+ _IOW('V', BASE_VIDIOC_PRIVATE + 17, unsigned int)
+
#define RK_VIDIOC_COMPAT_VCM_TIMEINFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 0, struct rk_cam_compat_vcm_tim)
#define RK_VIDIOC_COMPAT_IRIS_TIMEINFO \
@@ -70,43 +86,47 @@
_IOR('V', BASE_VIDIOC_PRIVATE + 2, struct rk_cam_compat_vcm_tim)
#define RK_VIDIOC_COMPAT_ZOOM1_TIMEINFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 11, struct rk_cam_compat_vcm_tim)
-#endif
struct rk_cam_modify_pos {
- s32 focus_pos;
- s32 zoom_pos;
- s32 zoom1_pos;
+ __s32 focus_pos;
+ __s32 zoom_pos;
+ __s32 zoom1_pos;
};
struct rk_cam_set_focus {
- bool is_need_reback;
- s32 focus_pos;
+ _Bool is_need_reback;
+ __s32 focus_pos;
};
struct rk_cam_zoom_pos {
- s32 zoom_pos;
- s32 focus_pos;
+ __s32 zoom_pos;
+ __s32 focus_pos;
};
struct rk_cam_set_zoom {
- bool is_need_zoom_reback;
- bool is_need_focus_reback;
- u32 setzoom_cnt;
+ _Bool is_need_zoom_reback;
+ _Bool is_need_focus_reback;
+ __u32 setzoom_cnt;
struct rk_cam_zoom_pos zoom_pos[VCMDRV_SETZOOM_MAXCNT];
};
struct rk_cam_vcm_tim {
- struct timeval vcm_start_t;
- struct timeval vcm_end_t;
+ struct __kernel_old_timeval vcm_start_t;
+ struct __kernel_old_timeval vcm_end_t;
};
-#ifdef CONFIG_COMPAT
-struct rk_cam_compat_vcm_tim {
- struct compat_timeval vcm_start_t;
- struct compat_timeval vcm_end_t;
+#ifndef __kernel_old_timeval32
+struct __kernel_old_timeval32 {
+ __s32 tv_sec;
+ __s32 tv_usec;
};
#endif
+struct rk_cam_compat_vcm_tim {
+ struct __kernel_old_timeval32 vcm_start_t;
+ struct __kernel_old_timeval32 vcm_end_t;
+};
+
struct rk_cam_vcm_cfg {
int start_ma;
int rated_ma;
--
Gitblit v1.6.2