From: root <root@zyc-desktop.(none)>
Date: Sat, 25 Aug 2012 09:16:55 +0000 (+0800)
Subject: camera rk30 : disable CIF_DO_CROP, work something wrong with rk2928 now.
X-Git-Tag: firefly_0821_release~8837
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a36516dccace2553da5027841828bbf394575a0;p=firefly-linux-kernel-4.4.55.git

camera rk30 : disable CIF_DO_CROP, work something wrong with rk2928 now.
---

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index d9a28406cc4c..2944951f344b 100755
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -59,7 +59,6 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 
 #define RKCAMERA_TR(format, ...) printk(KERN_ERR format, ## __VA_ARGS__)
 #define RKCAMERA_DG(format, ...) dprintk(1, format, ## __VA_ARGS__)
-#define CIF_DO_CROP 1
 // CIF Reg Offset
 #define  CIF_CIF_CTRL                       0x00
 #define  CIF_CIF_INTEN                      0x04
@@ -203,12 +202,16 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define IS_CIF0()		(pcdev->hostid == RK_CAM_PLATFORM_DEV_ID_0)
 #if (CONFIG_CAMERA_SCALE_CROP_MACHINE == RK_CAM_SCALE_CROP_IPP)
 #define CROP_ALIGN_BYTES (0x03)
+#define CIF_DO_CROP 0
 #elif (CONFIG_CAMERA_SCALE_CROP_MACHINE == RK_CAM_SCALE_CROP_ARM)
 #define CROP_ALIGN_BYTES (0x03)
+#define CIF_DO_CROP 0
 #elif (CONFIG_CAMERA_SCALE_CROP_MACHINE == RK_CAM_SCALE_CROP_RGA)
 #define CROP_ALIGN_BYTES (0x03)
+#define CIF_DO_CROP 0
 #elif(CONFIG_CAMERA_SCALE_CROP_MACHINE == RK_CAM_SCALE_CROP_PP)
 #define CROP_ALIGN_BYTES (0x0F)
+#define CIF_DO_CROP 1
 #endif
 //Configure Macro
 /*