projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5e0c04)
camera: fix camera pmem also allocate when camera driver have not compile
authorddl <ddl@rockchip.com>
Thu, 2 Jun 2011 02:02:57 +0000 (10:02 +0800)
committerddl <ddl@rockchip.com>
Thu, 2 Jun 2011 02:03:13 +0000 (10:03 +0800)
arch/arm/mach-rk29/board-rk29-ddr3sdk.c patch | blob | history
arch/arm/mach-rk29/board-rk29-phonesdk.c patch | blob | history
arch/arm/mach-rk29/board-rk29phonepadsdk.c patch | blob | history
arch/arm/mach-rk29/board-rk29sdk.c patch | blob | history
drivers/media/video/rk29_camera.c patch | blob | history

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index 9fa485a328844127cfec0ad7e32043898b5e4645..84fbbec17a03eacc8c8d054407c9db7a8daeba52 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -80,10 +80,10 @@
 #define CONFIG_SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L
 #define CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1 RK29_CAM_POWERDNACTIVE_H
 #define CONFIG_SENSOR_FLASHACTIVE_LEVEL_1 RK29_CAM_FLASHACTIVE_L
+#endif  //#ifdef CONFIG_VIDEO_RK29
 /*---------------- Camera Sensor Configuration Macro End------------------------*/
 #include "../../../drivers/media/video/rk29_camera.c"
 /*---------------- Camera Sensor Macro Define End  ------------------------*/
-#endif  //#ifdef CONFIG_VIDEO_RK29
 
 /* Set memory size of pmem */
 #ifdef CONFIG_RK29_MEM_SIZE_M
@@ -722,6 +722,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
  * camera  devices
  * author: ddl@rock-chips.com
  *****************************************************************************************/
+#ifdef CONFIG_VIDEO_RK29 
 #define CONFIG_SENSOR_POWER_IOCTL_USR      0
 #define CONFIG_SENSOR_RESET_IOCTL_USR      0
 #define CONFIG_SENSOR_POWERDOWN_IOCTL_USR      0
@@ -782,7 +783,7 @@ static struct rk29camera_platform_ioctl_cb  sensor_ioctl_cb = {
 };
 
 #include "../../../drivers/media/video/rk29_camera.c"
-
+#endif
 /*****************************************************************************************
  * backlight  devices
  * author: nzy@rock-chips.com
diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index 105291e971f195bd659e8a1a3cd9cfe57e848759..ac4faccb9511e158802902421455f71017835820 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -103,10 +103,11 @@
 #define CONFIG_SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L
 #define CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1 RK29_CAM_POWERDNACTIVE_H
 #define CONFIG_SENSOR_FLASHACTIVE_LEVEL_1 RK29_CAM_FLASHACTIVE_L
+#endif  //#ifdef CONFIG_VIDEO_RK29
 /*---------------- Camera Sensor Configuration Macro End------------------------*/
 #include "../../../drivers/media/video/rk29_camera.c"
 /*---------------- Camera Sensor Macro Define End  ------------------------*/
-#endif  //#ifdef CONFIG_VIDEO_RK29
+
 
 /* Set memory size of pmem */
 #ifdef CONFIG_RK29_MEM_SIZE_M
@@ -1780,6 +1781,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
  * camera  devices
  * author: ddl@rock-chips.com
  *****************************************************************************************/
+#ifdef CONFIG_VIDEO_RK29 
 #define CONFIG_SENSOR_POWER_IOCTL_USR      0
 #define CONFIG_SENSOR_RESET_IOCTL_USR      0
 #define CONFIG_SENSOR_POWERDOWN_IOCTL_USR      0
@@ -1839,6 +1841,7 @@ static struct rk29camera_platform_ioctl_cb  sensor_ioctl_cb = {
     #endif
 };
 #include "../../../drivers/media/video/rk29_camera.c"
+#endif
 
 /*****************************************************************************************
  * backlight  devices
diff --git a/arch/arm/mach-rk29/board-rk29phonepadsdk.c b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
index 390110d0dbf03795c18bd1a449450dc5e2520fc9..97345b2f3ad118b106502c6873d94dc483c2c519 100644 (file)
--- a/arch/arm/mach-rk29/board-rk29phonepadsdk.c
+++ b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
@@ -83,10 +83,11 @@
 #define CONFIG_SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L
 #define CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1 RK29_CAM_POWERDNACTIVE_H
 #define CONFIG_SENSOR_FLASHACTIVE_LEVEL_1 RK29_CAM_FLASHACTIVE_L
+#endif  //#ifdef CONFIG_VIDEO_RK29
 /*---------------- Camera Sensor Configuration Macro End------------------------*/
 #include "../../../drivers/media/video/rk29_camera.c"
 /*---------------- Camera Sensor Macro Define End  ------------------------*/
-#endif  //#ifdef CONFIG_VIDEO_RK29
+
 
 /* Set memory size of pmem */
 #ifdef CONFIG_RK29_MEM_SIZE_M
@@ -710,6 +711,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
  * camera  devices
  * author: ddl@rock-chips.com
  *****************************************************************************************/
+#ifdef CONFIG_VIDEO_RK29 
 #define CONFIG_SENSOR_POWER_IOCTL_USR      0
 #define CONFIG_SENSOR_RESET_IOCTL_USR      0
 #define CONFIG_SENSOR_POWERDOWN_IOCTL_USR      0
@@ -769,7 +771,7 @@ static struct rk29camera_platform_ioctl_cb  sensor_ioctl_cb = {
     #endif
 };
 #include "../../../drivers/media/video/rk29_camera.c"
-
+#endif
 /*****************************************************************************************
  * backlight  devices
  * author: nzy@rock-chips.com
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 66757bbd4d619f31b0de00b0c9df21c39f384e91..37d7e6222bdcce117f219afd17a880fb1564773d 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -80,10 +80,11 @@
 #define CONFIG_SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L
 #define CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1 RK29_CAM_POWERDNACTIVE_H
 #define CONFIG_SENSOR_FLASHACTIVE_LEVEL_1 RK29_CAM_FLASHACTIVE_L
+#endif  //#ifdef CONFIG_VIDEO_RK29
 /*---------------- Camera Sensor Configuration Macro End------------------------*/
 #include "../../../drivers/media/video/rk29_camera.c"
 /*---------------- Camera Sensor Macro Define End  ------------------------*/
-#endif  //#ifdef CONFIG_VIDEO_RK29
+
 
 /* Set memory size of pmem */
 #ifdef CONFIG_RK29_MEM_SIZE_M
@@ -727,6 +728,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
  * camera  devices
  * author: ddl@rock-chips.com
  *****************************************************************************************/
+#ifdef CONFIG_VIDEO_RK29
 #define CONFIG_SENSOR_POWER_IOCTL_USR      0
 #define CONFIG_SENSOR_RESET_IOCTL_USR      0
 #define CONFIG_SENSOR_POWERDOWN_IOCTL_USR      0
@@ -786,7 +788,7 @@ static struct rk29camera_platform_ioctl_cb  sensor_ioctl_cb = {
     #endif
 };
 #include "../../../drivers/media/video/rk29_camera.c"
-
+#endif
 /*****************************************************************************************
  * backlight  devices
  * author: nzy@rock-chips.com
diff --git a/drivers/media/video/rk29_camera.c b/drivers/media/video/rk29_camera.c
index 7a17f7fa513c5b2a625e784444b7bd74d909d6a3..d55043daba2f820f4713073ba4ae2b6427d2f0e5 100755 (executable)
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@ -1,9 +1,7 @@
 #include <mach/rk29_camera.h> \r
 \r
-#ifdef CONFIG_VIDEO_RK29\r
-\r
 #ifndef PMEM_CAM_SIZE\r
-\r
+#ifdef CONFIG_VIDEO_RK29 \r
 /*---------------- Camera Sensor Fixed Macro Begin  ------------------------*/\r
 // Below Macro is fixed, programer don't change it!!!!!!
 #define _CONS(a,b) a##b
@@ -49,13 +47,16 @@
 #define PMEM_CAM_NECESSARY   0x800000        /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */\r
 #endif
 /*---------------- Camera Sensor Fixed Macro End  ------------------------*/\r
-\r
+#else   //#ifdef CONFIG_VIDEO_RK29 \r
+#define PMEM_CAM_NECESSARY   0x00000000\r
+#endif\r
 #else   // #ifdef PMEM_CAM_SIZE\r
 \r
 /*****************************************************************************************
  * camera  devices
  * author: ddl@rock-chips.com
  *****************************************************************************************/\r
+#ifdef CONFIG_VIDEO_RK29 \r
 static int camera_debug;\r
 module_param(camera_debug, int, S_IRUGO|S_IWUSR);\r
 
Unnamed repository; edit this file 'description' to name the repository.