Merge tag 'pm-fixes-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-zii-rdu2.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
index eeb7679fd348a4932d123a8bd7ec76fb5107cc63..7812fbac963c933f7247af8172a8bb17704761e0 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
@@ -390,7 +390,7 @@
        clock-frequency = <100000>;
        status = "okay";
 
-       pmic@08 {
+       pmic@8 {
                compatible = "fsl,pfuze100";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_pfuze100_irq>;
@@ -543,7 +543,7 @@
 
                rmi4-f01@1 {
                        reg = <0x1>;
-                       syna,nosleep-mode = <1>;
+                       syna,nosleep-mode = <2>;
                };
 
                rmi4-f11@11 {
@@ -728,6 +728,7 @@
 
 &usbh1 {
        vbus-supply = <&reg_5p0v_main>;
+       disable-over-current;
        status = "okay";
 };