diff options
| author | Devesh Jhunjhunwala <deveshj@codeaurora.org> | 2016-06-14 02:01:08 -0700 |
|---|---|---|
| committer | Devesh Jhunjhunwala <deveshj@codeaurora.org> | 2016-07-12 11:12:16 -0700 |
| commit | 848d2fada7a11b15661fe78c0587b41d3d47ddc4 (patch) | |
| tree | 9c7ce73b2c8b95b8d6be19edec6c6d734b32dbf7 | |
| parent | 74ec31a097ae391e286a5c3989f8445eeb3e991d (diff) | |
ARM: dts: msm: Add switch nodes to pmicobalt
The camera driver needs to be able to independently control
the front led and the rear leds from separate camera devices.
Update the pmicobalt flash-led device to support two switch
nodes, one of which controls the two rear leds and the other
controls the front led. Also update the camera device to use
the new switch node phandle.
CRs-Fixed: 1024187
Change-Id: I13d5a64fc35ca80e928d6da689d7b19cbbdb8fe5
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi | 4 |
3 files changed, 19 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi b/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi index c43ac0320c7a..fad834199be5 100644 --- a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi @@ -683,10 +683,22 @@ pinctrl-1 = <&led_disable>; }; - pmicobalt_switch: qcom,led_switch { + pmicobalt_switch0: qcom,led_switch_0 { label = "switch"; - qcom,led-name = "led:switch"; - qcom,default-led-trigger = "switch_trigger"; + qcom,led-name = "led:switch_0"; + qcom,led-mask = <3>; + qcom,default-led-trigger = "switch0_trigger"; + reg0 { + regulator-name = "pmicobalt_bob"; + max-voltage-uv = <3600000>; + }; + }; + + pmicobalt_switch1: qcom,led_switch_1 { + label = "switch"; + qcom,led-name = "led:switch_1"; + qcom,led-mask = <4>; + qcom,default-led-trigger = "switch1_trigger"; reg0 { regulator-name = "pmicobalt_bob"; max-voltage-uv = <3600000>; 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 83b55da92fa2..3ed038069319 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi @@ -16,7 +16,7 @@ cell-index = <0>; compatible = "qcom,camera-flash"; qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>; - qcom,switch-source = <&pmicobalt_switch>; + qcom,switch-source = <&pmicobalt_switch0>; status = "ok"; }; @@ -24,7 +24,7 @@ cell-index = <1>; compatible = "qcom,camera-flash"; qcom,flash-source = <&pmicobalt_flash2>; - qcom,switch-source = <&pmicobalt_switch>; + qcom,switch-source = <&pmicobalt_switch1>; status = "ok"; }; }; 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 92be85073351..d152c0049f96 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi @@ -16,7 +16,7 @@ cell-index = <0>; compatible = "qcom,camera-flash"; qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>; - qcom,switch-source = <&pmicobalt_switch>; + qcom,switch-source = <&pmicobalt_switch0>; status = "ok"; }; @@ -24,7 +24,7 @@ cell-index = <1>; compatible = "qcom,camera-flash"; qcom,flash-source = <&pmicobalt_flash2>; - qcom,switch-source = <&pmicobalt_switch>; + qcom,switch-source = <&pmicobalt_switch1>; status = "ok"; }; }; |