media: rockchip: isp/ispp to version v1.2.1

Change-Id: Ia371119cd091dbbad1d7c7bd9ab8806f9d755614
Signed-off-by: Cai YiWei <cyw@rock-chips.com>

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

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

include/uapi/linux/rkisp2-config.h

@@ -10,7 +10,7 @@
 #include <linux/types.h>
 #include <linux/v4l2-controls.h>
 
-#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)

include/uapi/linux/rkispp-config.h

@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/v4l2-controls.h>
 
-#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)