brcm63xx: dts: Unify naming of gpio-led nodes

[openwrt/staging/chunkeey.git] / target / linux / brcm63xx / dts / agpf-s0.dts

diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts
index eaa45b9e09618ebc26161cc9087f1b3d2dc9c67d..0b9c39771987104b2526c274a79f0295cc284a31 100644 (file)
--- a/target/linux/brcm63xx/dts/agpf-s0.dts
+++ b/target/linux/brcm63xx/dts/agpf-s0.dts
@@ -1,89 +1,98 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Pirelli Alice Gate AGPF-S0";
        compatible = "pirelli,agpf-s0", "brcm,bcm6358";
 
-       gpio-keys-polled {
+       chosen {
+               bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
+       };
+
+       keys {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
-               debounce-interval = <60>;
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 2 1>;
-                       linux,code = <0x211>;
+                       gpios = <&pinctrl 34 1>;
+                       linux,code = <KEY_WPS_BUTTON>;
+                       debounce-interval = <60>;
                };
+
                reset {
                        label = "reset";
-                       gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       gpios = <&pinctrl 37 1>;
+                       linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green {
                        label = "AGPF-S0:green:power";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
                        label = "AGPF-S0:red:power";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
                service_green {
                        label = "AGPF-S0:green:service";
-                       gpios = <&gpio0 6 1>;
+                       gpios = <&pinctrl 6 1>;
                };
                service_red {
                        label = "AGPF-S0:red:service";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&pinctrl 7 1>;
                };
                dsl_green {
                        label = "AGPF-S0:green:adsl";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&pinctrl 9 1>;
                };
                dsl_red {
                        label = "AGPF-S0:red:adsl";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&pinctrl 10 1>;
                };
                wifi_green {
                        label = "AGPF-S0:green:wifi";
-                       gpios = <&gpio0 22 1>;
+                       gpios = <&pinctrl 22 1>;
                };
                wifi_red {
                        label = "AGPF-S0:red:wifi";
-                       gpios = <&gpio0 23 1>;
+                       gpios = <&pinctrl 23 1>;
                };
                inet_red {
                        label = "AGPF-S0:red:internet";
-                       gpios = <&gpio0 24 1>;
+                       gpios = <&pinctrl 24 1>;
                };
                inet_green {
                        label = "AGPF-S0:green:internet";
-                       gpios = <&gpio0 25 1>;
+                       gpios = <&pinctrl 25 1>;
                };
                usr1_green {
                        label = "AGPF-S0:green:usr1";
-                       gpios = <&gpio0 26 1>;
+                       gpios = <&pinctrl 26 1>;
                };
                usr1_red {
                        label = "AGPF-S0:red:usr1";
-                       gpios = <&gpio0 27 1>;
+                       gpios = <&pinctrl 27 1>;
                };
                usr2_green {
                        label = "AGPF-S0:green:usr2";
-                       gpios = <&gpio0 29 1>;
+                       gpios = <&pinctrl 29 1>;
                };
                usr2_red {
                        label = "AGPF-S0:red:usr2";
-                       gpios = <&gpio0 30 1>;
+                       gpios = <&pinctrl 30 1>;
                };
        };
 };
@@ -91,21 +100,30 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
+
+&uart0 {
+       status = "ok";
+};