brcm63xx: drop linux,part-probe usage where possible

[openwrt/openwrt.git] / target / linux / brcm63xx / dts / a226m-fwb.dts

diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts
index ced66ddfcd411f3e3e566ff0664d1f98d34c7ca8..0695e839e583729c3429d28519f02e0677f6d3a8 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m-fwb.dts
+++ b/target/linux/brcm63xx/dts/a226m-fwb.dts
@@ -9,7 +9,8 @@
        compatible = "pirelli,a226m-fwb", "brcm,bcm6358";
 
        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,12 +22,12 @@
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 2 1>;
+                       gpios = <&pinctrl 34 1>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
                reset {
                        label = "reset";
-                       gpios = <&gpio1 5 1>;
+                       gpios = <&pinctrl 37 1>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -36,56 +37,56 @@
 
                voip_red {
                        label = "DWV-S0:red:VoIP";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                };
                eth_red {
                        label = "DWV-S0:red:ethernet";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&pinctrl 1 1>;
                };
                dsl_green {
                        label = "DWV-S0:green:ADSL";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&pinctrl 2 1>;
                };
                usb_green {
                        label = "DWV-S0:green:USB";
-                       gpios = <&gpio0 3 1>;
+                       gpios = <&pinctrl 3 1>;
                };
                power_green {
                        label = "DWV-S0:green:power";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
                        label = "DWV-S0:red:power";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
                inet_red {
                        label = "DWV-S0:red:internet";
-                       gpios = <&gpio0 6 1>;
+                       gpios = <&pinctrl 6 1>;
                };
                inet_green {
                        label = "DWV-S0:green:internet";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&pinctrl 7 1>;
                };
                eth_green {
                        label = "DWV-S0:green:ethernet";
-                       gpios = <&gpio0 8 1>;
+                       gpios = <&pinctrl 8 1>;
                };
                voip_green {
                        label = "DWV-S0:green:VoIP";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&pinctrl 9 1>;
                };
                wifi_red {
                        label = "DWV-S0:red:wifi";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&pinctrl 10 1>;
                };
                usb_red {
                        label = "DWV-S0:red:USB";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&pinctrl 11 1>;
                };
                dsl_red {
                        label = "DWV-S0:red:ADSL";
-                       gpios = <&gpio0 12 1>;
+                       gpios = <&pinctrl 12 1>;
                };
        };
 };
@@ -93,21 +94,30 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
+
+&uart0 {
+       status = "ok";
+};