From 516e4e717889e2443b44bdb79a63bfd84aac74df Mon Sep 17 00:00:00 2001 From: Mukund Madhusudan Atre Date: Fri, 7 Feb 2020 18:07:49 -0800 Subject: [PATCH] ARM: dts: msm: Add support for led flash in camera for Lahaina Adding flash and torch info in camera device tree. CRs-Fixed: 2584631 Change-Id: I118883be46b8073ca31e3525dad7d56d2a504054 --- lahaina-camera-sensor-cdp.dtsi | 37 ++++++++++++++++++++++++++++++++++ lahaina-camera-sensor-mtp.dtsi | 37 ++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/lahaina-camera-sensor-cdp.dtsi b/lahaina-camera-sensor-cdp.dtsi index 9f9d62f576ce..5d9645693639 100644 --- a/lahaina-camera-sensor-cdp.dtsi +++ b/lahaina-camera-sensor-cdp.dtsi @@ -1,5 +1,39 @@ #include +&soc { + led_flash_triple_rear: qcom,camera-flash@4 { + cell-index = <4>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8350c_flash0 &pm8350c_flash1>; + torch-source = <&pm8350c_torch0 &pm8350c_torch1>; + switch-source = <&pm8350c_switch2>; + status = "ok"; + }; + + led_flash_triple_rear_aux: qcom,camera-flash@5 { + cell-index = <5>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8350c_flash0 &pm8350c_flash1>; + torch-source = <&pm8350c_torch0 &pm8350c_torch1>; + switch-source = <&pm8350c_switch2>; + status = "ok"; + }; + + led_flash_triple_rear_aux2: qcom,camera-flash@6 { + cell-index = <6>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8350c_flash0 &pm8350c_flash1>; + torch-source = <&pm8350c_torch0 &pm8350c_torch1>; + switch-source = <&pm8350c_switch2>; + status = "ok"; + }; + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; +}; + &cam_cci0 { actuator_triple_tele: qcom,actuator0 { cell-index = <0>; @@ -140,6 +174,7 @@ sensor-position-yaw = <180>; eeprom-src = <&eeprom_triple_tele>; actuator-src = <&actuator_triple_tele>; + led-flash-src = <&led_flash_triple_rear_aux>; cam_vio-supply = <&pm8008j_l3>; cam_vana-supply = <&pm8008i_l4>; cam_vdig-supply = <&pm8008i_l2>; @@ -182,6 +217,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_triple_wide>; eeprom-src = <&eeprom_triple_wide>; + led-flash-src = <&led_flash_triple_rear>; cam_vio-supply = <&pm8008j_l3>; cam_vana-supply = <&pm8008i_l3>; cam_v_custom1-supply = <&pm8008i_l5>; @@ -379,6 +415,7 @@ sensor-position-yaw = <180>; eeprom-src = <&eeprom_triple_uw>; actuator-src = <&actuator_triple_uw>; + led-flash-src = <&led_flash_triple_rear_aux2>; cam_vio-supply = <&pm8008j_l3>; cam_vana-supply = <&pm8008i_l6>; cam_vdig-supply = <&pm8008i_l2>; diff --git a/lahaina-camera-sensor-mtp.dtsi b/lahaina-camera-sensor-mtp.dtsi index 9f9d62f576ce..5d9645693639 100644 --- a/lahaina-camera-sensor-mtp.dtsi +++ b/lahaina-camera-sensor-mtp.dtsi @@ -1,5 +1,39 @@ #include +&soc { + led_flash_triple_rear: qcom,camera-flash@4 { + cell-index = <4>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8350c_flash0 &pm8350c_flash1>; + torch-source = <&pm8350c_torch0 &pm8350c_torch1>; + switch-source = <&pm8350c_switch2>; + status = "ok"; + }; + + led_flash_triple_rear_aux: qcom,camera-flash@5 { + cell-index = <5>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8350c_flash0 &pm8350c_flash1>; + torch-source = <&pm8350c_torch0 &pm8350c_torch1>; + switch-source = <&pm8350c_switch2>; + status = "ok"; + }; + + led_flash_triple_rear_aux2: qcom,camera-flash@6 { + cell-index = <6>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8350c_flash0 &pm8350c_flash1>; + torch-source = <&pm8350c_torch0 &pm8350c_torch1>; + switch-source = <&pm8350c_switch2>; + status = "ok"; + }; + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; +}; + &cam_cci0 { actuator_triple_tele: qcom,actuator0 { cell-index = <0>; @@ -140,6 +174,7 @@ sensor-position-yaw = <180>; eeprom-src = <&eeprom_triple_tele>; actuator-src = <&actuator_triple_tele>; + led-flash-src = <&led_flash_triple_rear_aux>; cam_vio-supply = <&pm8008j_l3>; cam_vana-supply = <&pm8008i_l4>; cam_vdig-supply = <&pm8008i_l2>; @@ -182,6 +217,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_triple_wide>; eeprom-src = <&eeprom_triple_wide>; + led-flash-src = <&led_flash_triple_rear>; cam_vio-supply = <&pm8008j_l3>; cam_vana-supply = <&pm8008i_l3>; cam_v_custom1-supply = <&pm8008i_l5>; @@ -379,6 +415,7 @@ sensor-position-yaw = <180>; eeprom-src = <&eeprom_triple_uw>; actuator-src = <&actuator_triple_uw>; + led-flash-src = <&led_flash_triple_rear_aux2>; cam_vio-supply = <&pm8008j_l3>; cam_vana-supply = <&pm8008i_l6>; cam_vdig-supply = <&pm8008i_l2>;