brcm63xx: switch to new partition layout specification

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

diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts
index 8a19856e29c044351c0fff2ae323eee5fa61a3ef..e4dc24d6d7866429e25e601280d118df45f43eea 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-b.dts
+++ b/target/linux/brcm63xx/dts/hg556a-b.dts
@@ -8,6 +8,11 @@
        model = "Huawei EchoLife HG556a (version B)";
        compatible = "huawei,hg556a-b", "brcm,bcm6358";
 
+       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>;
@@ -17,22 +22,22 @@
 
                help {
                        label = "help";
-                       gpios = <&gpio0 8 1>;
+                       gpios = <&pinctrl 8 1>;
                        linux,code = <KEY_HELP>;
                };
                wlan {
                        label = "wlan";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&pinctrl 9 1>;
                        linux,code = <KEY_WLAN>;
                };
                restart {
                        label = "restart";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&pinctrl 10 1>;
                        linux,code = <KEY_RESTART>;
                };
                reset {
                        label = "reset";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&pinctrl 11 1>;
                        linux,code = <KEY_CONFIG>;
                };
        };
@@ -42,57 +47,57 @@
 
                message_red {
                        label = "HW556:red:message";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                };
                hspa_red {
                        label = "HW556:red:hspa";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&pinctrl 1 1>;
                };
                dsl_red {
                        label = "HW556:red:dsl";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&pinctrl 2 1>;
                };
                power_red {
                        label = "HW556:red:power";
-                       gpios = <&gpio0 3 1>;
+                       gpios = <&pinctrl 3 1>;
                        default-state = "on";
                };
                all_red {
                        label = "HW556:red:all";
-                       gpios = <&gpio0 6 1>;
+                       gpios = <&pinctrl 6 1>;
                        default-state = "on";
                };
                lan1_green {
                        label = "HW556:green:lan1";
-                       gpios = <&gpio0 12 1>;
+                       gpios = <&pinctrl 12 1>;
                };
                lan1_red {
                        label = "HW556:red:lan1";
-                       gpios = <&gpio0 13 1>;
+                       gpios = <&pinctrl 13 1>;
                };
                lan2_green {
                        label = "HW556:green:lan2";
-                       gpios = <&gpio0 15 1>;
+                       gpios = <&pinctrl 15 1>;
                };
                lan2_red {
                        label = "HW556:red:lan2";
-                       gpios = <&gpio0 22 1>;
+                       gpios = <&pinctrl 22 1>;
                };
                lan3_green {
                        label = "HW556:green:lan3";
-                       gpios = <&gpio0 23 1>;
+                       gpios = <&pinctrl 23 1>;
                };
                lan3_red {
                        label = "HW556:red:lan3";
-                       gpios = <&gpio0 26 1>;
+                       gpios = <&pinctrl 26 1>;
                };
                lan4_green {
                        label = "HW556:green:lan4";
-                       gpios = <&gpio0 27 1>;
+                       gpios = <&pinctrl 27 1>;
                };
                lan4_red {
                        label = "HW556:red:lan4";
-                       gpios = <&gpio0 28 1>;
+                       gpios = <&pinctrl 28 1>;
                };
        };
 };
@@ -102,25 +107,36 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xec0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       cal_data@ee0000 {
-               label = "cal_data";
-               reg = <0xee0000 0x100000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xec0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               cal_data@ee0000 {
+                       label = "cal_data";
+                       reg = <0xee0000 0x100000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
+
+&uart0 {
+       status = "ok";
+};