diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index 31fcd8839d3b..7f33877a3552 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -63,6 +63,11 @@ * 1. resolution write directly to reg for first dev * 2. normal read back to enable hdr merge * 3. enable LDCH in 2th frame + * + * v1.2.1: + * 1. fix normal merge enable config + * 2. fix size no update for multi sensor switch + * 3. dmatx add yuyv format */ #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 8ef6737097ad..4541428e5e02 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -60,6 +60,9 @@ * 5. fix monitor thread exit * 6. tnr/nr/fec sync to start * 7. fec read yuyv format + * + * v1.2.1: + * 1. fix can't work due to last abnormal exit */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index df1d40379c17..07dcb432cad4 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, 2, 0) +#define RKISP_API_VERSION KERNEL_VERSION(1, 2, 1) #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 53f09b74f70d..75a99fc3d0c3 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, 2, 0) +#define ISPP_API_VERSION KERNEL_VERSION(1, 2, 1) #define ISPP_MODULE_TNR BIT(0)//2TO1 #define ISPP_MODULE_NR BIT(1)