brcm63xx: drop root parameter from cmdline

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

diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts
index 2dae1aff723c6f401a7726434a0b35c86c5002ab..57ab97aa863eafea2b119fe458f406a2d9ff93d3 100644 (file)
--- a/target/linux/brcm63xx/dts/f5d7633.dts
+++ b/target/linux/brcm63xx/dts/f5d7633.dts
@@ -9,7 +9,8 @@
        compatible = "belkin,f5d7633", "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 {
@@ -21,7 +22,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 6 1>;
+                       gpios = <&pinctrl 6 1>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -31,24 +32,24 @@
 
                power_green {
                        label = "96348GW-10:green:power";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                stop_green {
                        label = "96348GW-10:green:stop";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&pinctrl 1 1>;
                };
                adsl_fail_green {
                        label = "96348GW-10:green:adsl-fail";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&pinctrl 2 1>;
                };
                ppp_green {
                        label = "96348GW-10:green:ppp";
-                       gpios = <&gpio0 3 1>;
+                       gpios = <&pinctrl 3 1>;
                };
                ppp_fail_green {
                        label = "96348GW-10:green:ppp-fail";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                };
        };
 };
@@ -58,19 +59,35 @@
 
        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 0x3c0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
+
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0x3c0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@3e0000 {
-               label = "nvram";
-               reg = <0x3e0000 0x020000>;
+               nvram@3e0000 {
+                       label = "nvram";
+                       reg = <0x3e0000 0x020000>;
+               };
        };
 };
+
+&pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
+};
+
+&uart0 {
+       status = "ok";
+};