ath79, brcm63xx: Fix debounce-interval properties in gpio-keys-polled nodes

[openwrt/openwrt.git] / target / linux / brcm63xx / dts / vh4032n.dts

diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts
index 8b8abd9b4a1726f7baf5bfe69a17c37c084751cb..6788026d625e1e018badadd0aee3d31a977f5793 100644 (file)
--- a/target/linux/brcm63xx/dts/vh4032n.dts
+++ b/target/linux/brcm63xx/dts/vh4032n.dts
@@ -9,7 +9,8 @@
        compatible = "observa,vh4032n", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
        };
 
        gpio-keys-polled {
@@ -17,17 +18,19 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
-               debounce-interval = <60>;
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 2 1>;
+                       gpios = <&pinctrl 34 1>;
                        linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
                };
+
                wps {
                        label = "wps";
-                       gpios = <&gpio1 3 1>;
+                       gpios = <&pinctrl 35 1>;
                        linux,code = <KEY_WPS_BUTTON>;
+                       debounce-interval = <60>;
                };
        };
 
@@ -36,41 +39,41 @@
 
                dsl_blue {
                        label = "VH4032N:blue:dsl";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&pinctrl 2 1>;
                };
                dsl_red {
                        label = "VH4032N:red:dsl";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
                hspa_blue {
                        label = "VH4032N:blue:hspa";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&pinctrl 11 1>;
                };
                hspa_red {
                        label = "VH4032N:red:hspa";
-                       gpios = <&gpio0 12 1>;
+                       gpios = <&pinctrl 12 1>;
                };
                power_blue {
                        label = "VH4032N:blue:power";
-                       gpios = <&gpio0 22 0>;
+                       gpios = <&pinctrl 22 0>;
                };
                power_red {
                        label = "VH4032N:red:power";
-                       gpios = <&gpio0 24 0>;
+                       gpios = <&pinctrl 24 0>;
                        default-state = "on";
                };
                voice_blue {
                        label = "VH4032N:blue:voice";
-                       gpios = <&gpio0 25 1>;
+                       gpios = <&pinctrl 25 1>;
                };
                voice_red {
                        label = "VH4032N:red:voice";
-                       gpios = <&gpio0 26 1>;
+                       gpios = <&pinctrl 26 1>;
                };
        };
 };
 
-&gpio0 {
+&pinctrl {
        usb_hub_reset {
                gpio-hog;
                gpios = <27 0>;
@@ -82,21 +85,30 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x0000000 0x0020000>;
-               read-only;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x0000000 0x0020000>;
+                       read-only;
+               };
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x0020000 0x1fc0000>;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x0020000 0x1fc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@1fe0000 {
-               label = "nvram";
-               reg = <0x1fe0000 0x020000>;
+               nvram@1fe0000 {
+                       label = "nvram";
+                       reg = <0x1fe0000 0x020000>;
+               };
        };
 };
+
+&uart0 {
+       status = "ok";
+};