diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-22 18:50:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-22 18:50:23 -0800 |
| commit | 2e2825f85a80b400d743691f617c2fcc7d5030e0 (patch) | |
| tree | 44f5a5ef601c8e1502c97f6552dbee581f687cbc | |
| parent | ba4fdd9852b5a61b6a22385a9e6cab9ea78346b9 (diff) | |
| parent | 5217beb812db9333a53f65c8cc622ed6afdce42b (diff) | |
Merge "ARM: dts: msm: Add support for new flash mode on msm8998 skuk board"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi index 69b0286dba09..3e7b5614bc55 100644 --- a/arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi @@ -16,6 +16,7 @@ cell-index = <0>; compatible = "qcom,camera-flash"; qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>; + qcom,torch-source = <&pmi8998_torch0 &pmi8998_torch1>; qcom,switch-source = <&pmi8998_switch0>; status = "ok"; }; @@ -24,6 +25,7 @@ cell-index = <1>; compatible = "qcom,camera-flash"; qcom,flash-source = <&pmi8998_flash2>; + qcom,torch-source = <&pmi8998_torch2>; qcom,switch-source = <&pmi8998_switch1>; status = "ok"; }; |