From 6545ac24fff232cdf7ab163c1551615cd86f17a6 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 29 Mar 2021 11:45:25 +0800 Subject: [PATCH] media: rockchip: isp/ispp to version v1.5.2 Change-Id: I75d545c76ca4e59392211db9dbafd379141bbf19 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/version.h | 12 ++++++++++++ drivers/media/platform/rockchip/ispp/version.h | 12 ++++++++++++ include/uapi/linux/rkisp2-config.h | 2 +- include/uapi/linux/rkispp-config.h | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index 2ae26b0f7779..70e8147864f3 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -111,6 +111,18 @@ * 11. fix extend line with isp input crop case * 12. set lgmean related regs for tmo in hdr isr * + * v1.5.2: + * 1. reorder of subdev stream + * 2. fix media link err for name don't match + * 3. switch hdr_done interrupt according to hdrtmo cnt mode + * 4. support output isp/ispp reg in nv12 format + * 5. isp and ispp add shutdown + * 6. image input from user + * 7. import dma API for memory synchronisation for thunderboot + * 8. don't start ldch asynchronously in multi-isp mode + * 9. fix err of mp dump raw for isp20 + * 10. make sure 3dlut no continuous read twice + * 11. adjust rdbk times with mulit dev for isp2.0 */ #define RKISP_DRIVER_VERSION RKISP_API_VERSION diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h index b6a7cf302886..e7da8cc6b447 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -87,6 +87,18 @@ * 2. fix config of clk_dbg * 3. check frame id when apply params * + * v1.5.2 (match aiq v1.56.4) + * 1. limit min clk to 50 + * 2. check scl stop if fec enable + * 3. sync to free buf for multi dev stream off + * 4. support output isp/ispp reg in nv12 format + * 5. isp and ispp add shutdown + * 6. optimize the frame rate of fec en + * 7. image input from user + * 8. fix input video config + * 9. add cru reset + * 10. check SHARP_CORE_CTRL after update + * 11. add uvnr sd32 self en control */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index 992750928ce3..e05c63675599 100644 --- a/include/uapi/linux/rkisp2-config.h +++ b/include/uapi/linux/rkisp2-config.h @@ -10,7 +10,7 @@ #include #include -#define RKISP_API_VERSION KERNEL_VERSION(1, 5, 1) +#define RKISP_API_VERSION KERNEL_VERSION(1, 5, 2) #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 d6d6ceaf0870..0810c97d33e5 100644 --- a/include/uapi/linux/rkispp-config.h +++ b/include/uapi/linux/rkispp-config.h @@ -9,7 +9,7 @@ #include #include -#define ISPP_API_VERSION KERNEL_VERSION(1, 5, 1) +#define ISPP_API_VERSION KERNEL_VERSION(1, 5, 2) #define ISPP_ID_TNR (0) #define ISPP_ID_NR (1)