From a2698f4948f1e4c1e35e7a2cfd5a79f56b894d5d Mon Sep 17 00:00:00 2001 From: Viswanadha Raju Thotakura Date: Wed, 3 Aug 2016 18:25:39 -0700 Subject: [PATCH] msm: camera: Add support for reading new property tag Add support to read new current property tag from PMIC LED. This parameter is used for torch mode. CRs-Fixed: 1021009 Change-Id: I368a8bc2760d4f8bed847aefae59af2839e828cd Signed-off-by: Viswanadha Raju Thotakura --- .../platform/msm/camera_v2/sensor/flash/msm_flash.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c index c12e95d3310a..1fc51d900cf8 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c +++ b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c @@ -846,9 +846,14 @@ static int32_t msm_flash_get_pmic_source_info( "qcom,current", &fctrl->torch_op_current[i]); if (rc < 0) { - pr_err("current: read failed\n"); - of_node_put(torch_src_node); - continue; + rc = of_property_read_u32(torch_src_node, + "qcom,current-ma", + &fctrl->torch_op_current[i]); + if (rc < 0) { + pr_err("current: read failed\n"); + of_node_put(torch_src_node); + continue; + } } /* Read max-current */