camera rk30 : use ion mem for default.

diff --git a/arch/arm/configs/rk30_sdk_defconfig b/arch/arm/configs/rk30_sdk_defconfig
old mode 100755 (executable)
new mode 100644 (file)
index a96a073..7dfdf86
--- a/arch/arm/configs/rk30_sdk_defconfig
+++ b/arch/arm/configs/rk30_sdk_defconfig
@@ -265,6 +265,7 @@ CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
 CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
+CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
 CONFIG_ION_ROCKCHIP=y
 CONFIG_FB=y

diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c
index a7991b790e82a84177505ba22aa529f8fcf7d0f9..b5addd65e60c5529b433253910316db40418fd7f 100755 (executable)
--- a/arch/arm/plat-rk/rk_camera.c
+++ b/arch/arm/plat-rk/rk_camera.c
@@ -251,14 +251,8 @@
 \r
 \r
 #ifdef CONFIG_VIDEO_RK29_CAMMEM_ION\r
-    #ifdef CONFIG_ARCH_RK29\r
     #undef PMEM_CAM_NECESSARY\r
     #define PMEM_CAM_NECESSARY 0x00000000\r
-    #endif\r
-#else\r
-    #ifdef CONFIG_ARCH_RK30\r
-//    #error "Camera driver memory configuration is alloc from pmem, but ARCH_RK30 isn't support"\r
-    #endif    \r
 #endif\r
 \r
 \r