diff options
| author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2015-11-23 22:04:07 +0300 |
|---|---|---|
| committer | Andy Gross <agross@codeaurora.org> | 2015-12-09 08:33:13 +0300 |
| commit | 7026d15c7ac10dda22a9f3eda508459c924d7142 (patch) | |
| tree | c77f76204834911a3e503713b4c7a34d9ea60ce9 /arch/arm | |
| parent | 2ca9c2a4c1ef5faac27076475261788302158722 (diff) | |
| download | linux-7026d15c7ac10dda22a9f3eda508459c924d7142.tar.xz | |
ARM: dts: qcom: msm8974: Disable wled and move it to honami
The properties specified in the wled node could harm connected hardware,
so move the properties to Honami and disable the platform node.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 13 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom-pm8941.dtsi | 9 |
2 files changed, 15 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts index 37741725b7bd..a0398b69f4f2 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -403,4 +403,17 @@ qcom,vset-millivolts = <3000>; }; }; + + pm8941@1 { + wled@d800 { + status = "ok"; + + qcom,cs-out; + qcom,current-limit = <20>; + qcom,current-boost-limit = <805>; + qcom,switching-freq = <1600>; + qcom,ovp = <29>; + qcom,num-strings = <2>; + }; + }; }; diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi index a149c6f13870..ca53a5947437 100644 --- a/arch/arm/boot/dts/qcom-pm8941.dtsi +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi @@ -159,17 +159,12 @@ #address-cells = <1>; #size-cells = <0>; - wled@d800 { + pm8941_wled: wled@d800 { compatible = "qcom,pm8941-wled"; reg = <0xd800 0x100>; label = "backlight"; - qcom,cs-out; - qcom,current-limit = <20>; - qcom,current-boost-limit = <805>; - qcom,switching-freq = <1600>; - qcom,ovp = <29>; - qcom,num-strings = <2>; + status = "disabled"; }; }; }; |