From: zyc <zyc@rock-chips.com>
Date: Tue, 16 Oct 2012 07:11:13 +0000 (+0800)
Subject: camera 3066b: modify power control function, modify hi253 driver.
X-Git-Tag: firefly_0821_release~8409
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=746d83aac7061ca30b1cbea22630d1133ae44c14;p=firefly-linux-kernel-4.4.55.git

camera 3066b: modify power control function, modify hi253 driver.
---

diff --git a/arch/arm/mach-rk30/board-rk3066b-m701-camera.c b/arch/arm/mach-rk30/board-rk3066b-m701-camera.c
index 865a3400e104..19e4cff0fe4f 100644
--- a/arch/arm/mach-rk30/board-rk3066b-m701-camera.c
+++ b/arch/arm/mach-rk30/board-rk3066b-m701-camera.c
@@ -92,7 +92,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_IIC_ADAPTER_ID_11    4
 #define CONFIG_SENSOR_ORIENTATION_11       270
 #define CONFIG_SENSOR_POWER_PIN_11         INVALID_GPIO
 #define CONFIG_SENSOR_RESET_PIN_11         INVALID_GPIO
@@ -154,8 +154,8 @@
 static void rk_cif_power(int on)
 {
     struct regulator *ldo_18,*ldo_28;
-	ldo_28 = regulator_get(NULL, "ldo7");	// vcc28_cif
-	ldo_18 = regulator_get(NULL, "ldo1");	// vcc18_cif
+	ldo_28 = regulator_get(NULL, "vmmc");	// vcc28_cif
+	ldo_18 = regulator_get(NULL, "vdig1");	// vcc18_cif
 	if (ldo_28 == NULL || IS_ERR(ldo_28) || ldo_18 == NULL || IS_ERR(ldo_18)){
         printk("get cif ldo failed!\n");
 		return;
diff --git a/drivers/media/video/hi253.c b/drivers/media/video/hi253.c
index 0588114773ea..128faf789933 100755
--- a/drivers/media/video/hi253.c
+++ b/drivers/media/video/hi253.c
@@ -1191,7 +1191,7 @@ static struct reginfo sensor_sxga[] =
 };
 static struct reginfo sensor_xga[] =
 {
-	{0x01, 0xf8},
+	//{0x01, 0xf8},
 	{END_REG, END_REG},
 };
 /* 800X600 SVGA,30fps*/