camera rk30 : wrong definition of sensor bus id ,fix it.

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 26ef71da0fad8423aba13d93f9ea1844df188379..c97a3313d5833a12e884dffc944a878bf1ad6094 100755 (executable)
--- 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 (file)
new mode 100755 (executable)
index b2bcd7e..a7991b7
--- 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)\r
             },\r
             .link_info = {\r
-               #ifdef SENSOR_CIF_BUSID_1\r
-               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #ifdef SENSOR_CIF_BUSID_01\r
+               .bus_id= SENSOR_CIF_BUSID_01,\r
                #else\r
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
@@ -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)\r
             },\r
             .link_info = {\r
-               #ifdef SENSOR_CIF_BUSID_1\r
-               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #ifdef SENSOR_CIF_BUSID_02\r
+               .bus_id= SENSOR_CIF_BUSID_02,\r
                #else\r
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
@@ -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)\r
             },\r
             .link_info = {\r
-               #ifdef SENSOR_CIF_BUSID_1\r
-               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #ifdef SENSOR_CIF_BUSID_11\r
+               .bus_id= SENSOR_CIF_BUSID_11,\r
                #else\r
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
@@ -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)\r
             },\r
             .link_info = {\r
-               #ifdef SENSOR_CIF_BUSID_1\r
-               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #ifdef SENSOR_CIF_BUSID_12\r
+               .bus_id= SENSOR_CIF_BUSID_12,\r
                #else\r
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r