msm: camera: Camera sensor bringup on 8930 EVT SGLTE
ov8825 & ov9724 sensor drivers added on 8930 EVT
Change-Id: I10f2fe984e2dba70d3f027f1aff39b41a01aed3c
Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930-camera.c b/arch/arm/mach-msm/board-8930-camera.c
index ea4215a..6192cc4 100644
--- a/arch/arm/mach-msm/board-8930-camera.c
+++ b/arch/arm/mach-msm/board-8930-camera.c
@@ -13,6 +13,7 @@
#include <asm/mach-types.h>
#include <linux/gpio.h>
+#include <mach/socinfo.h>
#include <mach/camera.h>
#include <mach/msm_bus_board.h>
#include <mach/gpiomux.h>
@@ -154,6 +155,16 @@
},
};
+static struct msm_gpiomux_config msm8930_evt_cam_configs[] = {
+ {
+ .gpio = 75,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &cam_settings[2],
+ [GPIOMUX_SUSPENDED] = &cam_settings[0],
+ },
+ },
+};
+
static struct msm_gpiomux_config msm8930_cam_2d_configs[] = {
{
.gpio = 18,
@@ -185,6 +196,23 @@
},
};
+static struct msm_gpiomux_config msm8930_evt_cam_2d_configs[] = {
+ {
+ .gpio = 36,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &cam_settings[3],
+ [GPIOMUX_SUSPENDED] = &cam_settings[8],
+ },
+ },
+ {
+ .gpio = 37,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &cam_settings[3],
+ [GPIOMUX_SUSPENDED] = &cam_settings[8],
+ },
+ },
+};
+
#define VFE_CAMIF_TIMER1_GPIO 2
#define VFE_CAMIF_TIMER2_GPIO 3
#define VFE_CAMIF_TIMER3_GPIO_INT 4
@@ -203,6 +231,12 @@
._fsrc.ext_driver_src.led_flash_en = VFE_CAMIF_TIMER2_GPIO,
._fsrc.ext_driver_src.flash_id = MAM_CAMERA_EXT_LED_FLASH_TPS61310,
};
+
+static struct msm_camera_sensor_flash_src msm_flash_src_led = {
+ .flash_sr_type = MSM_CAMERA_FLASH_SRC_LED1,
+ ._fsrc.ext_driver_src.led_en = VFE_CAMIF_TIMER1_GPIO,
+ ._fsrc.ext_driver_src.led_flash_en = VFE_CAMIF_TIMER2_GPIO,
+};
#endif
static struct msm_bus_vectors cam_init_vectors[] = {
@@ -410,16 +444,34 @@
{"cam_vaf", REG_LDO, 2800000, 2850000, 300000},
};
+static struct camera_vreg_t msm_8930_evt_cam_vreg[] = {
+ {"cam_vdig", REG_LDO, 1500000, 1500000, 105000},
+ {"cam_vio", REG_VS, 0, 0, 0},
+ {"cam_vana", REG_LDO, 2800000, 2850000, 85600},
+ {"cam_vaf", REG_LDO, 2800000, 2850000, 300000},
+};
+
static struct gpio msm8930_common_cam_gpio[] = {
{20, GPIOF_DIR_IN, "CAMIF_I2C_DATA"},
{21, GPIOF_DIR_IN, "CAMIF_I2C_CLK"},
};
+static struct gpio msm8930_evt_common_cam_gpio[] = {
+ {36, GPIOF_DIR_IN, "CAMIF_I2C_DATA"},
+ {37, GPIOF_DIR_IN, "CAMIF_I2C_CLK"},
+};
+
static struct gpio msm8930_front_cam_gpio[] = {
{4, GPIOF_DIR_IN, "CAMIF_MCLK"},
{76, GPIOF_DIR_OUT, "CAM_RESET"},
};
+static struct gpio msm8930_evt_front_cam_gpio[] = {
+ {4, GPIOF_DIR_IN, "CAMIF_MCLK"},
+ {76, GPIOF_DIR_OUT, "CAM_RESET"},
+ {75, GPIOF_DIR_OUT, "CAM_STBY_N"},
+};
+
static struct gpio msm8930_back_cam_gpio[] = {
{5, GPIOF_DIR_IN, "CAMIF_MCLK"},
{107, GPIOF_DIR_OUT, "CAM_RESET"},
@@ -431,6 +483,13 @@
{76, GPIOF_OUT_INIT_HIGH, 4000},
};
+static struct msm_gpio_set_tbl msm8930_evt_front_cam_gpio_set_tbl[] = {
+ {75, GPIOF_OUT_INIT_LOW, 1000},
+ {75, GPIOF_OUT_INIT_HIGH, 4000},
+ {76, GPIOF_OUT_INIT_LOW, 1000},
+ {76, GPIOF_OUT_INIT_HIGH, 4000},
+};
+
static struct msm_gpio_set_tbl msm8930_back_cam_gpio_set_tbl[] = {
{54, GPIOF_OUT_INIT_LOW, 1000},
{54, GPIOF_OUT_INIT_HIGH, 4000},
@@ -449,6 +508,17 @@
.cam_gpio_set_tbl_size = ARRAY_SIZE(msm8930_front_cam_gpio_set_tbl),
};
+static struct msm_camera_gpio_conf msm_8930_evt__front_cam_gpio_conf = {
+ .cam_gpiomux_conf_tbl = msm8930_evt_cam_2d_configs,
+ .cam_gpiomux_conf_tbl_size = ARRAY_SIZE(msm8930_evt_cam_2d_configs),
+ .cam_gpio_common_tbl = msm8930_evt_common_cam_gpio,
+ .cam_gpio_common_tbl_size = ARRAY_SIZE(msm8930_evt_common_cam_gpio),
+ .cam_gpio_req_tbl = msm8930_evt_front_cam_gpio,
+ .cam_gpio_req_tbl_size = ARRAY_SIZE(msm8930_evt_front_cam_gpio),
+ .cam_gpio_set_tbl = msm8930_evt_front_cam_gpio_set_tbl,
+ .cam_gpio_set_tbl_size = ARRAY_SIZE(msm8930_evt_front_cam_gpio_set_tbl),
+};
+
static struct msm_camera_gpio_conf msm_8930_back_cam_gpio_conf = {
.cam_gpiomux_conf_tbl = msm8930_cam_2d_configs,
.cam_gpiomux_conf_tbl_size = ARRAY_SIZE(msm8930_cam_2d_configs),
@@ -460,10 +530,89 @@
.cam_gpio_set_tbl_size = ARRAY_SIZE(msm8930_back_cam_gpio_set_tbl),
};
+static struct msm_camera_gpio_conf msm_8930_evt_back_cam_gpio_conf = {
+ .cam_gpiomux_conf_tbl = msm8930_evt_cam_2d_configs,
+ .cam_gpiomux_conf_tbl_size = ARRAY_SIZE(msm8930_evt_cam_2d_configs),
+ .cam_gpio_common_tbl = msm8930_evt_common_cam_gpio,
+ .cam_gpio_common_tbl_size = ARRAY_SIZE(msm8930_evt_common_cam_gpio),
+ .cam_gpio_req_tbl = msm8930_back_cam_gpio,
+ .cam_gpio_req_tbl_size = ARRAY_SIZE(msm8930_back_cam_gpio),
+ .cam_gpio_set_tbl = msm8930_back_cam_gpio_set_tbl,
+ .cam_gpio_set_tbl_size = ARRAY_SIZE(msm8930_back_cam_gpio_set_tbl),
+};
+
static struct i2c_board_info msm_act_main_cam_i2c_info = {
I2C_BOARD_INFO("msm_actuator", 0x11),
};
+static struct msm_actuator_info msm_act_main_cam_3_info = {
+ .board_info = &msm_act_main_cam_i2c_info,
+ .cam_name = MSM_ACTUATOR_MAIN_CAM_3,
+ /* bus_id GSBI8 is specific to 8930 sglte evt */
+ .bus_id = MSM_8930_GSBI8_QUP_I2C_BUS_ID,
+ .vcm_pwd = 0,
+ .vcm_enable = 0,
+};
+
+
+static struct msm_camera_sensor_flash_data flash_ov8825 = {
+ .flash_type = MSM_CAMERA_FLASH_LED,
+#ifdef CONFIG_MSM_CAMERA_FLASH
+ .flash_src = &msm_flash_src_led
+#endif
+};
+
+static struct msm_camera_csi_lane_params ov8825_csi_lane_params = {
+ .csi_lane_assign = 0xE4,
+ .csi_lane_mask = 0x3,
+};
+
+static struct msm_camera_sensor_platform_info sensor_board_info_ov8825 = {
+ .mount_angle = 90,
+ .cam_vreg = msm_8930_evt_cam_vreg,
+ .num_vreg = ARRAY_SIZE(msm_8930_evt_cam_vreg),
+ .gpio_conf = &msm_8930_evt_back_cam_gpio_conf,
+ .csi_lane_params = &ov8825_csi_lane_params,
+};
+
+static struct msm_camera_sensor_info msm_camera_sensor_ov8825_data = {
+ .sensor_name = "ov8825",
+ .pdata = &msm_camera_csi_device_data[0],
+ .flash_data = &flash_ov8825,
+ .sensor_platform_info = &sensor_board_info_ov8825,
+ .csi_if = 1,
+ .camera_type = BACK_CAMERA_2D,
+ .sensor_type = BAYER_SENSOR,
+ .actuator_info = &msm_act_main_cam_3_info,
+};
+
+static struct msm_camera_sensor_flash_data flash_ov9724 = {
+ .flash_type = MSM_CAMERA_FLASH_NONE
+};
+
+static struct msm_camera_csi_lane_params ov9724_csi_lane_params = {
+ .csi_lane_assign = 0xE4,
+ .csi_lane_mask = 0x1,
+};
+
+static struct msm_camera_sensor_platform_info sensor_board_info_ov9724 = {
+ .mount_angle = 90,
+ .cam_vreg = msm_8930_evt_cam_vreg,
+ .num_vreg = ARRAY_SIZE(msm_8930_evt_cam_vreg),
+ .gpio_conf = &msm_8930_evt__front_cam_gpio_conf,
+ .csi_lane_params = &ov9724_csi_lane_params,
+};
+
+static struct msm_camera_sensor_info msm_camera_sensor_ov9724_data = {
+ .sensor_name = "ov9724",
+ .pdata = &msm_camera_csi_device_data[1],
+ .flash_data = &flash_ov9724,
+ .sensor_platform_info = &sensor_board_info_ov9724,
+ .csi_if = 1,
+ .camera_type = FRONT_CAMERA_2D,
+ .sensor_type = BAYER_SENSOR,
+};
+
static struct msm_actuator_info msm_act_main_cam_0_info = {
.board_info = &msm_act_main_cam_i2c_info,
.cam_name = MSM_ACTUATOR_MAIN_CAM_0,
@@ -605,6 +754,13 @@
msm_gpiomux_install(msm8930_cam_common_configs,
ARRAY_SIZE(msm8930_cam_common_configs));
+ if (machine_is_msm8930_evt() &&
+ (socinfo_get_platform_subtype() ==
+ PLATFORM_SUBTYPE_SGLTE)) {
+ msm_gpiomux_install(msm8930_evt_cam_configs,
+ ARRAY_SIZE(msm8930_evt_cam_configs));
+ }
+
if (machine_is_msm8930_cdp()) {
struct msm_camera_sensor_info *s_info;
s_info = &msm_camera_sensor_s5k3l1yx_data;
@@ -652,6 +808,14 @@
{
I2C_BOARD_INFO("tps61310", 0x66),
},
+ {
+ I2C_BOARD_INFO("ov8825", 0x6c>>1),
+ .platform_data = &msm_camera_sensor_ov8825_data,
+ },
+ {
+ I2C_BOARD_INFO("ov9724", 0x20>>1),
+ .platform_data = &msm_camera_sensor_ov9724_data,
+ },
};
struct msm_camera_board_info msm8930_camera_board_info = {
diff --git a/arch/arm/mach-msm/board-8930-regulator-pm8038.c b/arch/arm/mach-msm/board-8930-regulator-pm8038.c
index 0203db4..00af565 100644
--- a/arch/arm/mach-msm/board-8930-regulator-pm8038.c
+++ b/arch/arm/mach-msm/board-8930-regulator-pm8038.c
@@ -76,6 +76,19 @@
REGULATOR_SUPPLY("cam_vaf", "4-0048"),
REGULATOR_SUPPLY("cam_vana", "4-0020"),
REGULATOR_SUPPLY("cam_vaf", "4-0020"),
+/* Regulators for 8930 QRD SGLTE EVT */
+ REGULATOR_SUPPLY("cam_vana", "8-001a"),
+ REGULATOR_SUPPLY("cam_vana", "8-006c"),
+ REGULATOR_SUPPLY("cam_vana", "8-0048"),
+ REGULATOR_SUPPLY("cam_vana", "8-0020"),
+ REGULATOR_SUPPLY("cam_vana", "8-0036"),
+ REGULATOR_SUPPLY("cam_vana", "8-0010"),
+ REGULATOR_SUPPLY("cam_vaf", "8-001a"),
+ REGULATOR_SUPPLY("cam_vaf", "8-006c"),
+ REGULATOR_SUPPLY("cam_vaf", "8-0048"),
+ REGULATOR_SUPPLY("cam_vaf", "8-0020"),
+ REGULATOR_SUPPLY("cam_vaf", "8-0036"),
+ REGULATOR_SUPPLY("cam_vaf", "8-0010"),
REGULATOR_SUPPLY("vdd", "12-0018"),
REGULATOR_SUPPLY("vdd", "12-0068"),
};
@@ -103,7 +116,14 @@
REGULATOR_SUPPLY("cam_vdig", "4-001a"),
REGULATOR_SUPPLY("cam_vdig", "4-006c"),
REGULATOR_SUPPLY("cam_vdig", "4-0048"),
- REGULATOR_SUPPLY("cam_vdig", "4-0020"),
+ REGULATOR_SUPPLY("cam_vdig", "4-0020"),
+/* Regulators for 8930 QRD SGLTE EVT */
+ REGULATOR_SUPPLY("cam_vdig", "8-001a"),
+ REGULATOR_SUPPLY("cam_vdig", "8-006c"),
+ REGULATOR_SUPPLY("cam_vdig", "8-0048"),
+ REGULATOR_SUPPLY("cam_vdig", "8-0020"),
+ REGULATOR_SUPPLY("cam_vdig", "8-0036"),
+ REGULATOR_SUPPLY("cam_vdig", "8-0010"),
};
VREG_CONSUMERS(L13) = {
REGULATOR_SUPPLY("8038_l13", NULL),
@@ -202,7 +222,14 @@
REGULATOR_SUPPLY("cam_vio", "4-001a"),
REGULATOR_SUPPLY("cam_vio", "4-006c"),
REGULATOR_SUPPLY("cam_vio", "4-0048"),
- REGULATOR_SUPPLY("cam_vio", "4-0020"),
+ REGULATOR_SUPPLY("cam_vio", "4-0020"),
+/* Regulators for 8930 QRD SGLTE EVT */
+ REGULATOR_SUPPLY("cam_vio", "8-001a"),
+ REGULATOR_SUPPLY("cam_vio", "8-006c"),
+ REGULATOR_SUPPLY("cam_vio", "8-0048"),
+ REGULATOR_SUPPLY("cam_vio", "8-0020"),
+ REGULATOR_SUPPLY("cam_vio", "8-0036"),
+ REGULATOR_SUPPLY("cam_vio", "8-0010"),
};
VREG_CONSUMERS(LVS2) = {
REGULATOR_SUPPLY("8038_lvs2", NULL),
@@ -506,7 +533,7 @@
RPM_LDO(L9, 0, 1, 0, 2850000, 2850000, NULL, 0, 0),
RPM_LDO(L10, 0, 1, 0, 2900000, 2900000, NULL, 0, 0),
RPM_LDO(L11, 1, 1, 0, 1800000, 1800000, "8038_s4", 10000, 10000),
- RPM_LDO(L12, 0, 1, 0, 1200000, 1200000, "8038_s2", 0, 0),
+ RPM_LDO(L12, 0, 1, 0, 1200000, 1500000, "8038_s2", 0, 0),
RPM_LDO(L13, 0, 0, 0, 2220000, 2220000, NULL, 0, 0),
RPM_LDO(L14, 0, 1, 0, 1800000, 1800000, NULL, 0, 0),
RPM_LDO(L15, 0, 1, 0, 1800000, 2950000, NULL, 0, 0),
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 69e5288..624f8ea 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -2769,7 +2769,8 @@
int i;
#ifdef CONFIG_MSM_CAMERA
struct i2c_registry msm8930_camera_i2c_devices = {
- I2C_SURF | I2C_FFA | I2C_FLUID | I2C_LIQUID | I2C_RUMI,
+ I2C_SURF | I2C_FFA | I2C_FLUID | I2C_LIQUID | I2C_RUMI
+ | I2C_EVT,
MSM_8930_GSBI4_QUP_I2C_BUS_ID,
msm8930_camera_board_info.board_info,
msm8930_camera_board_info.num_i2c_board_info,
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 7375f99..bb163ae 100755
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -6054,7 +6054,7 @@
CLK_LOOKUP("core_clk", gsbi5_qup_clk.c, ""),
CLK_LOOKUP("core_clk", gsbi6_qup_clk.c, ""),
CLK_LOOKUP("core_clk", gsbi7_qup_clk.c, ""),
- CLK_LOOKUP("core_clk", gsbi8_qup_clk.c, ""),
+ CLK_LOOKUP("core_clk", gsbi8_qup_clk.c, "qup_i2c.8"),
CLK_LOOKUP("core_clk", gsbi9_qup_clk.c, "qup_i2c.0"),
CLK_LOOKUP("core_clk", gsbi10_qup_clk.c, "qup_i2c.10"),
CLK_LOOKUP("core_clk", gsbi11_qup_clk.c, ""),
@@ -6094,7 +6094,8 @@
CLK_LOOKUP("iface_clk", gsbi5_p_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("iface_clk", gsbi7_p_clk.c, ""),
- CLK_LOOKUP("iface_clk", gsbi8_p_clk.c, ""),
+ /* used on 8930 SGLTE for Camera */
+ CLK_LOOKUP("iface_clk", gsbi8_p_clk.c, "qup_i2c.8"),
/* used on 8930 SGLTE for Primary IPC */
CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "qup_i2c.0"),
@@ -6121,6 +6122,13 @@
CLK_LOOKUP("cam_clk", cam1_clk.c, "4-0048"),
CLK_LOOKUP("cam_clk", cam2_clk.c, NULL),
CLK_LOOKUP("cam_clk", cam0_clk.c, "4-0020"),
+ CLK_LOOKUP("cam_clk", cam0_clk.c, "8-001a"),
+ CLK_LOOKUP("cam_clk", cam0_clk.c, "8-0036"),
+ CLK_LOOKUP("cam_clk", cam1_clk.c, "8-006c"),
+ CLK_LOOKUP("cam_clk", cam1_clk.c, "8-0010"),
+ CLK_LOOKUP("cam_clk", cam1_clk.c, "8-0048"),
+ CLK_LOOKUP("cam_clk", cam2_clk.c, NULL),
+ CLK_LOOKUP("cam_clk", cam0_clk.c, "8-0020"),
CLK_LOOKUP("csi_src_clk", csi0_src_clk.c, "msm_csid.0"),
CLK_LOOKUP("csi_src_clk", csi1_src_clk.c, "msm_csid.1"),
CLK_LOOKUP("csi_src_clk", csi2_src_clk.c, "msm_csid.2"),