brcm63xx: drop root parameter from cmdline

[oweals/openwrt.git] / target / linux / brcm63xx / dts / bcm96348GW-11.dts

diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
index 78fba83cac94785ffddc5a815b2905ddc68061a3..fca961251f15247d5b1c85d1f8500a4c84040fe2 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
@@ -9,7 +9,8 @@
        compatible = "brcm,bcm96348gw-11", "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 = <&gpio1 1 1>;
+                       gpios = <&pinctrl 33 1>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -31,24 +32,24 @@
 
                power_green {
                        label = "96348GW-11:green:power";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                stop_green {
                        label = "96348GW-11:green:stop";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&pinctrl 1 1>;
                };
                adsl_fail_green {
                        label = "96348GW-11:green:adsl-fail";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&pinctrl 2 1>;
                };
                ppp_green {
                        label = "96348GW-11:green:ppp";
-                       gpios = <&gpio0 3 1>;
+                       gpios = <&pinctrl 3 1>;
                };
                ppp_fail_green {
                        label = "96348GW-11:green:ppp-fail";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                };
        };
 };
@@ -57,4 +58,17 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
+};
+
+&pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
+};
+
+&uart0 {
+       status = "ok";
 };