From ef73b389545ff842324e992fc78ecc851947a973 Mon Sep 17 00:00:00 2001 From: zyc Date: Wed, 3 Sep 2014 10:58:58 +0800 Subject: [PATCH] rk312x : cif : cif driver v0.0x1.3 --- arch/arm/boot/dts/rk3126-sdk.dts | 4 ++++ arch/arm/boot/dts/rk312x-sdk.dtsi | 3 --- drivers/media/video/rk30_camera_oneframe.c | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts index 778b25b95112..526285e9b24a 100755 --- 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 99894420a8ff..7d364c78fda8 100755 --- 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 c60920394141..e7b0f86e9f75 100755 --- 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); -- 2.34.1