brcm63xx: switch to new partition layout specification

[oweals/openwrt.git] / target / linux / brcm63xx / dts / dsl-2640b-b.dts

diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
index 6f2bda659ce7ef609f88c9caeef510678555e777..0acb5c6e76a07a541de3fd19ae128747600a1734 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
@@ -1,11 +1,18 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2640B rev B2";
        compatible = "d-link,dsl-2640b-b", "brcm,bcm6348";
 
+       chosen {
+               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
@@ -15,8 +22,8 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 7 1>;
-                       linux,code = <0x198>;
+                       gpios = <&pinctrl 7 1>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 
@@ -25,20 +32,20 @@
 
                power_green {
                        label = "D-4P-W:green:power";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                status {
                        label = "D-4P-W::status";
-                       gpios = <&gpio0 3 1>;
+                       gpios = <&pinctrl 3 1>;
                };
                inet_green {
                        label = "D-4P-W:green:internet";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                };
                inet_red {
                        label = "D-4P-W:red:internet";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
        };
 };
@@ -48,19 +55,35 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
+
+&pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
+};
+
+&uart0 {
+       status = "ok";
+};