[ARM] tegra: stingray: Add focuser to board-stingray-sensors

Also remove management of vcam ioctl, it will now be managed by
the focuser driver

Change-Id: I8114d831bbe62019ec022003fb61bd354093ee85
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

diff --git a/arch/arm/mach-tegra/board-stingray-sensors.c b/arch/arm/mach-tegra/board-stingray-sensors.c
index c69d0e5fb3ac5613dc64e568de8b59a6174d4777..bff8698168d0f31c200116037c3090f7f09f27c7 100755 (executable)
--- a/arch/arm/mach-tegra/board-stingray-sensors.c
+++ b/arch/arm/mach-tegra/board-stingray-sensors.c
@@ -47,8 +47,6 @@
 #define SOC2030_RESETN_GPIO    TEGRA_GPIO_PD5
 #define SOC2030_PWRDN_GPIO     TEGRA_GPIO_PBB5
 
-struct regulator *stingray_ov5650_regulator_vcam;
-
 static int stingray_ov5650_init(void)
 {
        tegra_gpio_enable(OV5650_RESETN_GPIO);
@@ -68,16 +66,6 @@ static int stingray_ov5650_init(void)
 
 static int stingray_ov5650_power_on(void)
 {
-       pr_info("power on the ov5650 sensor\n");
-       if (!stingray_ov5650_regulator_vcam) {
-               stingray_ov5650_regulator_vcam = regulator_get(NULL, "vcam");
-               if (IS_ERR(stingray_ov5650_regulator_vcam)) {
-                       pr_err("ov5650_power_on: couldn't get regulator vcam\n");
-                       return PTR_ERR(stingray_ov5650_regulator_vcam);
-               }
-       }
-
-       regulator_enable(stingray_ov5650_regulator_vcam);
        msleep(20);
 
        gpio_direction_output(OV5650_PWRDN_GPIO, 0);
@@ -97,7 +85,6 @@ static int stingray_ov5650_power_off(void)
 {
        gpio_direction_output(OV5650_PWRDN_GPIO, 1);
        gpio_direction_output(OV5650_RESETN_GPIO, 0);
-       regulator_disable(stingray_ov5650_regulator_vcam);
 
        return 0;
 }
@@ -124,7 +111,6 @@ static int stingray_soc2030_init(void)
        return 0;
 }
 
-
 static int stingray_soc2030_power_on(void)
 {
        gpio_direction_output(SOC2030_PWRDN_GPIO, 0);
@@ -368,16 +354,19 @@ static struct i2c_board_info __initdata stingray_i2c_bus3_sensor_info[] = {
                .platform_data = &stingray_lm3559_data,
         },
 
-       {
-               I2C_BOARD_INFO("ov5650", 0x36),
-               .platform_data = &stingray_ov5650_data,
-       },
+        {
+                I2C_BOARD_INFO("ov5650", 0x36),
+                .platform_data = &stingray_ov5650_data,
+        },
 
-       {
-               I2C_BOARD_INFO("soc2030", 0x3c),
-               .platform_data = &stingray_soc2030_data,
-       },
+        {
+                I2C_BOARD_INFO("dw9714l", 0x0C),
+        },
 
+        {
+                I2C_BOARD_INFO("soc2030", 0x3c),
+                .platform_data = &stingray_soc2030_data,
+        },
 };
 
 int __init stingray_sensors_init(void)