From: zyc <zyc@rock-chips.com>
Date: Tue, 11 Nov 2014 07:05:00 +0000 (+0800)
Subject: camsys_drv: v0.0x19.0
X-Git-Tag: firefly_0821_release~4481
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52761cd33586eb1c1c0a5115221f34f3e73b4239;p=firefly-linux-kernel-4.4.55.git

camsys_drv: v0.0x19.0
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 1591c45da8e1..aff193274495 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -387,6 +387,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_CAMSYS_DRV=y
 CONFIG_FLASHLIGHT=y
 CONFIG_LEDS_RT8547=y
 # CONFIG_RK30_CAMERA_ONEFRAME is not set
diff --git a/drivers/media/video/rk_camsys/Kconfig b/drivers/media/video/rk_camsys/Kconfig
index bd2b7e7bc970..d99c686e70f7 100755
--- a/drivers/media/video/rk_camsys/Kconfig
+++ b/drivers/media/video/rk_camsys/Kconfig
@@ -1,6 +1,6 @@
 config CAMSYS_DRV
 	tristate "camsys driver "
-	default y
+	default n
 	
 menu "RockChip camera system driver"
 	depends on CAMSYS_DRV
diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 58b372dfb41b..5a66051a2c44 100755
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -106,8 +106,10 @@
 *v0.0x18.0:
          1) add flashlight RT8547 driver
          2) support torch mode
+*v0.0x19.0:
+         1) set CONFIG_CAMSYS_DRV disable as default,enable in defconfig file if needed.
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x18,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x19,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"