From 6968bab0cd4f428c9e63afde2e0f8cc3be682acd Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Thu, 13 Aug 2020 15:36:19 +0800 Subject: [PATCH] media: rockchip: isp/ispp/cif/camera: add api version in common header Signed-off-by: Hu Kejun Change-Id: I59a68acb068131483c80da5865cdbe4800b59975 --- drivers/media/platform/rockchip/cif/version.h | 7 ++++++- drivers/media/platform/rockchip/isp/version.h | 7 ++++++- drivers/media/platform/rockchip/ispp/version.h | 7 ++++++- include/uapi/linux/rk-camera-module.h | 2 ++ include/uapi/linux/rkcif-config.h | 14 ++++++++++++++ include/uapi/linux/rkisp2-config.h | 2 ++ include/uapi/linux/rkispp-config.h | 2 ++ 7 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 include/uapi/linux/rkcif-config.h diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h index 09fe99cf9cbd..b79164cb9172 100644 --- a/drivers/media/platform/rockchip/cif/version.h +++ b/drivers/media/platform/rockchip/cif/version.h @@ -4,6 +4,7 @@ #ifndef _RKCIF_VERSION_H #define _RKCIF_VERSION_H #include +#include /* *RKCIF DRIVER VERSION NOTE @@ -31,8 +32,12 @@ *v0.1.4 *1. support vicap-full lvds interface to work in linear and hdr mode for rv1126 *2. add vicap-lite device for rv1126 + *v0.1.5 + *1. support crop function + *2. fix compile error when config with module + *3. support mipi yuv */ -#define RKCIF_DRIVER_VERSION KERNEL_VERSION(0, 1, 0x4) +#define RKCIF_DRIVER_VERSION RKCIF_API_VERSION #endif diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index 4dd0890078be..3a5cce0e7a53 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -4,6 +4,7 @@ #ifndef _RKISP_VERSION_H #define _RKISP_VERSION_H #include +#include /* *RKISP DRIVER VERSION NOTE @@ -13,8 +14,12 @@ * *v0.1.1: *1. support lvds interface + * + * v0.1.2: + * support multi virtual device; + * */ -#define RKISP_DRIVER_VERSION KERNEL_VERSION(0, 1, 0x1) +#define RKISP_DRIVER_VERSION RKISP_API_VERSION #endif diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h index 432fbbfba45d..e25759b12e8e 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -4,6 +4,7 @@ #ifndef _RKISPP_VERSION_H #define _RKISPP_VERSION_H #include +#include /* * RKISPP DRIVER VERSION NOTE @@ -15,8 +16,12 @@ * support fbc output format * support fec function * support oneframe mode + * + * v0.1.2: + * support multi virtual device; + * */ -#define RKISPP_DRIVER_VERSION KERNEL_VERSION(0, 1, 0x1) +#define RKISPP_DRIVER_VERSION ISPP_API_VERSION #endif diff --git a/include/uapi/linux/rk-camera-module.h b/include/uapi/linux/rk-camera-module.h index 55dcf5db51ad..5628e7e532ef 100644 --- a/include/uapi/linux/rk-camera-module.h +++ b/include/uapi/linux/rk-camera-module.h @@ -9,6 +9,8 @@ #include +#define RKMODULE_API_VERSION KERNEL_VERSION(0, 1, 0x1) + #define RKMODULE_NAME_LEN 32 #define RKMODULE_LSCDATA_LEN 441 diff --git a/include/uapi/linux/rkcif-config.h b/include/uapi/linux/rkcif-config.h new file mode 100644 index 000000000000..9ed0b4c9a157 --- /dev/null +++ b/include/uapi/linux/rkcif-config.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) + * + * Copyright (C) 2019 Rockchip Electronics Co., Ltd. + */ + +#ifndef _UAPI_RKCIF_CONFIG_H +#define _UAPI_RKCIF_CONFIG_H + +#include +#include + +#define RKCIF_API_VERSION KERNEL_VERSION(0, 1, 0x5) + +#endif diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index e8b4ada18d47..e858c7eaf7b0 100644 --- a/include/uapi/linux/rkisp2-config.h +++ b/include/uapi/linux/rkisp2-config.h @@ -10,6 +10,8 @@ #include #include +#define RKISP_API_VERSION KERNEL_VERSION(0, 1, 0x2) + #define RKISP_CMD_TRIGGER_READ_BACK \ _IOW('V', BASE_VIDIOC_PRIVATE + 0, struct isp2x_csi_trigger) diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h index ace9c2985026..ee3fc064bf11 100644 --- a/include/uapi/linux/rkispp-config.h +++ b/include/uapi/linux/rkispp-config.h @@ -9,6 +9,8 @@ #include #include +#define ISPP_API_VERSION KERNEL_VERSION(0, 1, 0x2) + #define ISPP_MODULE_TNR BIT(0)//2TO1 #define ISPP_MODULE_NR BIT(1) #define ISPP_MODULE_SHP BIT(2)