From 71a1b15ffd8d24e850bed973cd41f7e740119d45 Mon Sep 17 00:00:00 2001 From: Viswanadha Raju Thotakura Date: Wed, 25 May 2016 14:38:37 -0700 Subject: [PATCH] ARM: dts: msm: Add flash nodes to camera on msmcobalt Add support for camera flash operation. Add status property for csiphy, csid camera nodes. CRs-Fixed: 1021009 Change-Id: Ifa62e4e4662d72904411ff4dda10a29a76962851 Signed-off-by: Viswanadha Raju Thotakura --- .../dts/qcom/msmcobalt-camera-sensor-cdp.dtsi | 20 +++++++++++++++++++ .../dts/qcom/msmcobalt-camera-sensor-mtp.dtsi | 20 +++++++++++++++++++ arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi | 7 +++++++ 3 files changed, 47 insertions(+) diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi index fe145634fb80..83b55da92fa2 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi @@ -11,6 +11,24 @@ * GNU General Public License for more details. */ +&soc { + led_flash0: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>; + qcom,switch-source = <&pmicobalt_switch>; + status = "ok"; + }; + + led_flash1: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + qcom,flash-source = <&pmicobalt_flash2>; + qcom,switch-source = <&pmicobalt_switch>; + status = "ok"; + }; +}; + &cci { actuator0: qcom,actuator@0 { cell-index = <0>; @@ -181,6 +199,7 @@ qcom,csiphy-sd-index = <0>; qcom,csid-sd-index = <0>; qcom,mount-angle = <90>; + qcom,led-flash-src = <&led_flash0>; qcom,actuator-src = <&actuator0>; qcom,ois-src = <&ois0>; qcom,eeprom-src = <&eeprom0>; @@ -269,6 +288,7 @@ qcom,csid-sd-index = <2>; qcom,mount-angle = <90>; qcom,eeprom-src = <&eeprom2>; + qcom,led-flash-src = <&led_flash1>; qcom,actuator-src = <&actuator1>; cam_vio-supply = <&pmcobalt_lvs1>; cam_vana-supply = <&pmcobalt_l22>; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi index fe145634fb80..83b55da92fa2 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi @@ -11,6 +11,24 @@ * GNU General Public License for more details. */ +&soc { + led_flash0: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>; + qcom,switch-source = <&pmicobalt_switch>; + status = "ok"; + }; + + led_flash1: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + qcom,flash-source = <&pmicobalt_flash2>; + qcom,switch-source = <&pmicobalt_switch>; + status = "ok"; + }; +}; + &cci { actuator0: qcom,actuator@0 { cell-index = <0>; @@ -181,6 +199,7 @@ qcom,csiphy-sd-index = <0>; qcom,csid-sd-index = <0>; qcom,mount-angle = <90>; + qcom,led-flash-src = <&led_flash0>; qcom,actuator-src = <&actuator0>; qcom,ois-src = <&ois0>; qcom,eeprom-src = <&eeprom0>; @@ -269,6 +288,7 @@ qcom,csid-sd-index = <2>; qcom,mount-angle = <90>; qcom,eeprom-src = <&eeprom2>; + qcom,led-flash-src = <&led_flash1>; qcom,actuator-src = <&actuator1>; cam_vio-supply = <&pmcobalt_lvs1>; cam_vana-supply = <&pmcobalt_l22>; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi index 574f1e33f36d..fefa94a9127e 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi @@ -50,6 +50,7 @@ "camss_ispif_ahb_clk", "csiphy_clk_src", "csiphy_clk"; qcom,clock-rates = <0 0 0 0 0 0 256000000 0 0 269333333 0 0 256000000 0>; + status = "ok"; }; qcom,csiphy@ca35000 { @@ -81,6 +82,7 @@ "camss_ispif_ahb_clk", "csiphy_clk_src", "csiphy_clk"; qcom,clock-rates = <0 0 0 0 0 0 256000000 0 0 269333333 0 0 256000000 0>; + status = "ok"; }; qcom,csiphy@ca36000 { @@ -112,6 +114,7 @@ "camss_ispif_ahb_clk", "csiphy_clk_src", "csiphy_clk"; qcom,clock-rates = <0 0 0 0 0 0 256000000 0 0 269333333 0 0 256000000 0>; + status = "ok"; }; qcom,csid@ca30000 { @@ -187,6 +190,7 @@ "csi_pix_clk", "cphy_csid_clk", "cphy_clk_src"; qcom,clock-rates = <0 0 0 0 0 0 0 256000000 0 0 0 0 0 0 256000000>; + status = "ok"; }; qcom,csid@ca30800 { @@ -224,6 +228,7 @@ "csi_pix_clk", "cphy_csid_clk", "cphy_clk_src"; qcom,clock-rates = <0 0 0 0 0 0 0 256000000 0 0 0 0 0 0 256000000>; + status = "ok"; }; qcom,csid@ca30c00 { @@ -260,7 +265,9 @@ "csi_pix_clk", "cphy_csid_clk", "cphy_clk_src"; qcom,clock-rates = <0 0 0 0 0 0 0 256000000 0 0 0 0 0 256000000>; + status = "ok"; }; + qcom,cam_smmu { compatible = "qcom,msm-cam-smmu"; status = "ok";