From b290cb4415928b39f8960721c8c9341a565157a7 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 Apr 2012 10:48:09 +0800 Subject: [PATCH] camera rk30 : wrong definition of sensor bus id ,fix it. --- arch/arm/mach-rk30/board-rk30-sdk.c | 4 ++-- arch/arm/plat-rk/rk_camera.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) mode change 100644 => 100755 arch/arm/plat-rk/rk_camera.c diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c index 26ef71da0fad..c97a3313d583 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk.c +++ b/arch/arm/mach-rk30/board-rk30-sdk.c @@ -148,7 +148,7 @@ #define CONFIG_SENSOR_11 RK29_CAM_SENSOR_OV2659 /* front camera sensor 1 */ #define CONFIG_SENSOR_IIC_ADDR_11 0x00 #define CONFIG_SENSOR_IIC_ADAPTER_ID_11 3 -#define CONFIG_SENSOR_CIF_INDEX_1 0 +#define CONFIG_SENSOR_CIF_INDEX_11 0 #define CONFIG_SENSOR_ORIENTATION_11 270 #define CONFIG_SENSOR_POWER_PIN_11 INVALID_GPIO #define CONFIG_SENSOR_RESET_PIN_11 INVALID_GPIO @@ -171,7 +171,7 @@ #define CONFIG_SENSOR_12 RK29_CAM_SENSOR_OV2655 /* front camera sensor 2 */ #define CONFIG_SENSOR_IIC_ADDR_12 0x00 #define CONFIG_SENSOR_IIC_ADAPTER_ID_12 3 -#define CONFIG_SENSOR_CIF_INDEX_1 0 +#define CONFIG_SENSOR_CIF_INDEX_12 0 #define CONFIG_SENSOR_ORIENTATION_12 270 #define CONFIG_SENSOR_POWER_PIN_12 INVALID_GPIO #define CONFIG_SENSOR_RESET_PIN_12 INVALID_GPIO diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c old mode 100644 new mode 100755 index b2bcd7ec016d..a7991b790e82 --- a/arch/arm/plat-rk/rk_camera.c +++ b/arch/arm/plat-rk/rk_camera.c @@ -547,8 +547,8 @@ static struct rk29camera_platform_data rk_camera_platform_data = { I2C_BOARD_INFO(SENSOR_NAME_01, CONFIG_SENSOR_IIC_ADDR_01>>1) }, .link_info = { - #ifdef SENSOR_CIF_BUSID_1 - .bus_id= SENSOR_CIF_BUSID_1, + #ifdef SENSOR_CIF_BUSID_01 + .bus_id= SENSOR_CIF_BUSID_01, #else .bus_id= RK29_CAM_PLATFORM_DEV_ID, #endif @@ -580,8 +580,8 @@ static struct rk29camera_platform_data rk_camera_platform_data = { I2C_BOARD_INFO(SENSOR_NAME_02, CONFIG_SENSOR_IIC_ADDR_02>>1) }, .link_info = { - #ifdef SENSOR_CIF_BUSID_1 - .bus_id= SENSOR_CIF_BUSID_1, + #ifdef SENSOR_CIF_BUSID_02 + .bus_id= SENSOR_CIF_BUSID_02, #else .bus_id= RK29_CAM_PLATFORM_DEV_ID, #endif @@ -613,8 +613,8 @@ static struct rk29camera_platform_data rk_camera_platform_data = { I2C_BOARD_INFO(SENSOR_NAME_11, CONFIG_SENSOR_IIC_ADDR_11>>1) }, .link_info = { - #ifdef SENSOR_CIF_BUSID_1 - .bus_id= SENSOR_CIF_BUSID_1, + #ifdef SENSOR_CIF_BUSID_11 + .bus_id= SENSOR_CIF_BUSID_11, #else .bus_id= RK29_CAM_PLATFORM_DEV_ID, #endif @@ -646,8 +646,8 @@ static struct rk29camera_platform_data rk_camera_platform_data = { I2C_BOARD_INFO(SENSOR_NAME_12, CONFIG_SENSOR_IIC_ADDR_12>>1) }, .link_info = { - #ifdef SENSOR_CIF_BUSID_1 - .bus_id= SENSOR_CIF_BUSID_1, + #ifdef SENSOR_CIF_BUSID_12 + .bus_id= SENSOR_CIF_BUSID_12, #else .bus_id= RK29_CAM_PLATFORM_DEV_ID, #endif -- 2.34.1