evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: sensor: Detect flash_driver_type from dtsi"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-16 16:34:30 -07:00 • committed by Gerrit - the friendly Code Review server
commit d4e8e50daa
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c
View file

@ -920,6 +920,14 @@ static int32_t msm_flash_get_dt_data(struct device_node *of_node,
fctrl->flash_driver_type = FLASH_DRIVER_I2C; fctrl->flash_driver_type = FLASH_DRIVER_I2C;
} }
/* Read the flash and torch source info from device tree node */
rc = msm_flash_get_pmic_source_info(of_node, fctrl);
if (rc < 0) {
pr_err("%s:%d msm_flash_get_pmic_source_info failed rc %d\n",
__func__, __LINE__, rc);
return rc;
}
/* Read the gpio information from device tree */ /* Read the gpio information from device tree */
rc = msm_sensor_driver_get_gpio_data( rc = msm_sensor_driver_get_gpio_data(
&(fctrl->power_info.gpio_conf), of_node); &(fctrl->power_info.gpio_conf), of_node);
@ -934,13 +942,6 @@ static int32_t msm_flash_get_dt_data(struct device_node *of_node,
CDBG("%s:%d fctrl->flash_driver_type = %d", __func__, __LINE__, CDBG("%s:%d fctrl->flash_driver_type = %d", __func__, __LINE__,
fctrl->flash_driver_type); fctrl->flash_driver_type);
/* Read the flash and torch source info from device tree node */
rc = msm_flash_get_pmic_source_info(of_node, fctrl);
if (rc < 0) {
pr_err("%s:%d msm_flash_get_pmic_source_info failed rc %d\n",
__func__, __LINE__, rc);
return rc;
}
return rc; return rc;
} }