From: phc <phc@rock-chips.com>
Date: Mon, 5 Dec 2011 10:45:30 +0000 (+0800)
Subject: z5 phone:enable codec I2S-II in used
X-Git-Tag: firefly_0821_release~9723
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2e5a8ad4483579679cac3745466ca8ce159169ef;p=firefly-linux-kernel-4.4.55.git

z5 phone:enable codec I2S-II in used
---

diff --git a/arch/arm/configs/rk29_z5_defconfig b/arch/arm/configs/rk29_z5_defconfig
index aea975188826..69e8bd67829f 100644
--- a/arch/arm/configs/rk29_z5_defconfig
+++ b/arch/arm/configs/rk29_z5_defconfig
@@ -94,7 +94,7 @@ CONFIG_UID_STAT=y
 CONFIG_APANIC=y
 CONFIG_MTK23D=y
 CONFIG_RK29_GPS=y
-CONFIG_MPU_SENSORS_MPU3050=y
+CONFIG_MPU_SENSORS_MPU3050=m
 CONFIG_MPU_SENSORS_MMA845X=y
 CONFIG_MPU_SENSORS_PRESSURE_NONE=y
 CONFIG_MPU_SENSORS_TIMERIRQ=y
@@ -171,6 +171,7 @@ CONFIG_VIDEO_DEV=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_SOC_CAMERA=y
+CONFIG_SOC_CAMERA_OV7690=y
 CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_VIDEO_RK29=y
 CONFIG_FB=y