diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index 2ddb1f129c91..4d5bd7c401b7 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -68,6 +68,11 @@ * 1. fix normal merge enable config * 2. fix size no update for multi sensor switch * 3. dmatx add yuyv format + * + * v1.2.2: + * 1. isp/ispp add lock for multi dev runtime + * 2. support output isp/ispp reg on each frame + * 3. fix error detected by depmod */ #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 4541428e5e02..8ab6118d0b36 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -63,6 +63,13 @@ * * v1.2.1: * 1. fix can't work due to last abnormal exit + * + * v1.2.2: + * 1. isp/ispp add lock for multi dev runtime + * 2. fix error state of monitor + * 3. fix mmu err due to buf free for multi dev + * 4. support output isp/ispp reg on each frame + * 5. fix error detected by depmod */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index 23ed615038b5..ce65caf19458 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, 1) +#define RKISP_API_VERSION KERNEL_VERSION(1, 2, 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 7f5f740f59e0..d04835709fa4 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, 1) +#define ISPP_API_VERSION KERNEL_VERSION(1, 2, 2) #define ISPP_ID_TNR (0)