--- arch/arm/mach-msm/board-incrediblec.c

+++ arch/arm/mach-msm/board-incrediblec.c

@@ -55,9 +55,7 @@

#include "devices.h"

#include "proc_comm.h"

#include "smd_private.h"

-#if 1 /*allenou, bt for bcm, 2009/7/8 */

#include <mach/msm_serial_hs.h>

-#endif

#include <mach/tpa6130.h>

#include <mach/msm_flashlight.h>

#include <linux/atmel_qt602240.h>

@@ -847,25 +845,6 @@ MODULE_PARM_DESC(bdaddress, "BT MAC ADDR

#endif

static uint32_t camera_off_gpio_table[] = {

-

-#if 0 /* CAMERA OFF*/

- PCOM_GPIO_CFG(0, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT0 */

- PCOM_GPIO_CFG(1, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT1 */

- PCOM_GPIO_CFG(2, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT2 */

- PCOM_GPIO_CFG(3, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT3 */

- PCOM_GPIO_CFG(4, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT4 */

- PCOM_GPIO_CFG(5, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT5 */

- PCOM_GPIO_CFG(6, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT6 */

- PCOM_GPIO_CFG(7, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT7 */

- PCOM_GPIO_CFG(8, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT8 */

- PCOM_GPIO_CFG(9, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT9 */

- PCOM_GPIO_CFG(10, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT10 */

- PCOM_GPIO_CFG(11, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* DAT11 */

- PCOM_GPIO_CFG(12, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* PCLK */

- PCOM_GPIO_CFG(13, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* HSYNC */

- PCOM_GPIO_CFG(14, 0, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_4MA), /* VSYNC */

- PCOM_GPIO_CFG(15, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* MCLK */

-#endif

/* CAMERA SUSPEND*/

PCOM_GPIO_CFG(0, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* DAT0 */

PCOM_GPIO_CFG(1, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* DAT1 */

@@ -947,6 +926,26 @@ static int flashlight_control(int mode)

return aat1271_flashlight_control(mode);

}

+enum msm_camera_source camera_source;

+static void incrediblec_set_source(enum msm_camera_source source)

+{

+ camera_source = source;

+}

+

+enum msm_camera_source incrediblec_get_source(void){

+ return camera_source;

+}

+

+static int camera_main_probed = 0;

+static int incrediblec_camera_main_get_probe(void)

+{

+ return camera_main_probed;

+}

+static void incrediblec_camera_main_set_probe(int probed)

+{

+ camera_main_probed = probed;

+}

+

static struct camera_flash_cfg msm_camera_sensor_flash_cfg = {

.camera_flash = flashlight_control,

.num_flash_levels = FLASHLIGHT_NUM,

@@ -958,6 +957,9 @@ static struct msm_camera_sensor_info msm

.sensor_name = "ov8810",

.sensor_reset = INCREDIBLEC_CAM_RST, /* CAM1_RST */

.sensor_pwd = INCREDIBLEC_CAM_PWD, /* CAM1_PWDN, enabled in a9 */

+ .camera_set_source = incrediblec_set_source,

+ .camera_main_get_probe = incrediblec_camera_main_get_probe,

+ .camera_main_set_probe = incrediblec_camera_main_set_probe,

.pdata = &msm_camera_device_data,

.resource = msm_camera_resources,

.num_resources = ARRAY_SIZE(msm_camera_resources),