apm821xx: fix bogus key-presses on boot

[openwrt/staging/ynezz.git] / target / linux / apm821xx / dts / meraki-mx60.dts

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 881d9335a1eb5a7e0ae874fc5384aaea8b98b49b..3620005e4d250bdd76bef574ccc9b5947ff1fbf0 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -53,9 +53,6 @@
        ndfc@1,0 {
                status = "okay";
                nand {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
                        partition@0 {
                                label = "u-boot";
                                reg = <0x00000000 0x00100000>;
@@ -77,11 +74,6 @@
                                label = "ubi";
                                reg = <0x00240000 0x3fdc0000>;
                        };
-
-                       all {
-                               label = "all";
-                               reg = <0x00000000 0x40000000>;
-                       };
                };
        };
 };
@@ -108,6 +100,8 @@
                phy0: ethernet-phy@0 {
                        compatible = "ethernet-phy-id004d.d034";
                        reg = <0>;
+                       qca,mib-poll-interval = <500>;
+
                        qca,ar8327-initvals = <
                                0x0010 0x40000000
                                0x0624 0x007f7f7f
@@ -120,7 +114,7 @@
 };
 
 &POB0 {
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                status: power-green {
@@ -164,17 +158,16 @@
                };
        };
 
-       gpio_keys_polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <60>;   /* 3 * 20 = 60ms */
-               autorepeat;
+       keys {
+               compatible = "gpio-keys";
 
-               button@1 {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;
+                       interrupt-parent = <&UIC1>;
+                       interrupts = <0x15 IRQ_TYPE_EDGE_FALLING>;
+                       debounce-interval = <60>;
                };
        };
 };