rk312x : cif : cif driver v0.0x1.3

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 778b25b951125ecbcb4caf707f11b5b442107e97..526285e9b24a764371083e3252e59a9fcff444f4 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -109,6 +109,10 @@
        };
 };
 
+&i2c1 {
+       status = "okay";
+};
+
 &rk3126_cif_sensor{
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index 99894420a8fff85435d071d2b77000ff79dce780..7d364c78fda8ef459628675db70473792ef46519 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -175,9 +175,6 @@
                        status = "okay";
        };
 };
-&i2c1 {
-       status = "okay";
-};
 
 &i2c2 {
        status = "okay";

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index c609203941419c8caec8978eb0589241148479b2..e7b0f86e9f756d3a97f758480d95aef35bbb6c09 100755 (executable)
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -260,8 +260,10 @@ static u32 DISABLE_INVERT_PCLK_CIF1;
             cause warning, so remove this spin lock .
 *v0.1.2:
                 1. rk3126 and rk3128 use different dts file.            
+*v0.1.3:
+                1. i2c 1 and wifi use the common io in rk3128,so just enable i2c1 in rk3126 dts file
 */
-#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0x2)
+#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0x3)
 static int version = RK_CAM_VERSION_CODE;
 module_param(version, int, S_IRUGO);