Merge tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / qcom-msm8974-sony-xperia-castor.dts

diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
index e87f2c99060d46fd829e1a1619739349bf61ced3..701b396719c74aaaf8284f8cc2cac37b477f60be 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
@@ -491,7 +491,7 @@
                pinctrl-0 = <&i2c8_pins>;
 
                synaptics@2c {
-                       compatible = "syna,rmi-i2c";
+                       compatible = "syna,rmi4-i2c";
                        reg = <0x2c>;
 
                        interrupt-parent = <&msmgpio>;
@@ -506,6 +506,8 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&ts_int_pin>;
 
+                       syna,startup-delay-ms = <10>;
+
                        rmi-f01@1 {
                                reg = <0x1>;
                                syna,nosleep = <1>;