Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-pm8941.dtsi

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index cdd2bdb77b329c90a6a7708b02c01a1c28789c34..59d0cde63251a809733d0d49a5b3080b98692382 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -68,7 +68,7 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       boost_bypass_n_pin: boost-bypass {
+                       boost_bypass_n_pin: boost-bypass-state {
                                pins = "gpio21";
                                function = "normal";
                        };
@@ -144,6 +144,16 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
+               pm8941_lpg: lpg {
+                       compatible = "qcom,pm8941-lpg";
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #pwm-cells = <2>;
+
+                       status = "disabled";
+               };
+
                pm8941_wled: wled@d800 {
                        compatible = "qcom,pm8941-wled";
                        reg = <0xd800>;