brcm63xx: dts: Unify naming of gpio-led nodes

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

diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts
index 23378a4721d7a44b9faf664b19c2cf371712a33b..a1b6c2177b028f8c52fe0653650cfe9e6768c088 100644 (file)
--- a/target/linux/brcm63xx/dts/v2110.dts
+++ b/target/linux/brcm63xx/dts/v2110.dts
@@ -9,24 +9,25 @@
        compatible = "bt,v2110", "brcm,bcm6348";
 
        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 {
+       keys {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
-               debounce-interval = <60>;
 
                reset {
                        label = "reset";
                        gpios = <&pinctrl 33 1>;
                        linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green {
@@ -55,22 +56,27 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 
@@ -78,3 +84,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 };
+
+&uart0 {
+       status = "ok";
+};