brcm63xx: drop linux,part-probe usage where possible

[oweals/openwrt.git] / target / linux / brcm63xx / dts / fast2704n.dts

diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts
index 8756ca0a0fe968b651ce6d62fd40c117d02ad4af..b29367913bcfaaeb2cdec36f28e54a3876d26c03 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2704n.dts
+++ b/target/linux/brcm63xx/dts/fast2704n.dts
@@ -9,7 +9,8 @@
        compatible = "sagem,f@st2704n", "brcm,bcm6318";
 
        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,17 +22,17 @@
 
                wlan {
                        label = "wlan";
-                       gpios = <&gpio0 1 0>;
+                       gpios = <&pinctrl 1 0>;
                        linux,code = <KEY_WLAN>;
                };
                wps {
                        label = "wps";
-                       gpios = <&gpio1 1 1>;
+                       gpios = <&pinctrl 33 1>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
                reset {
                        label = "reset";
-                       gpios = <&gpio1 2 1>;
+                       gpios = <&pinctrl 34 1>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -41,48 +42,90 @@
 
                wps_green {
                        label = "F@ST2704N:green:wps";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&pinctrl 2 1>;
                };
                lan1_green {
                        label = "F@ST2704N:green:lan1";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                };
                lan2_green {
                        label = "F@ST2704N:green:lan2";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
                lan3_green {
                        label = "F@ST2704N:green:lan3";
-                       gpios = <&gpio0 6 1>;
+                       gpios = <&pinctrl 6 1>;
                };
                lan4_green {
                        label = "F@ST2704N:green:lan4";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&pinctrl 7 1>;
                };
                inet_green {
                        label = "F@ST2704N:green:inet";
-                       gpios = <&gpio0 8 1>;
+                       gpios = <&pinctrl 8 1>;
                };
                inet_red {
                        label = "F@ST2704N:red:inet";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&pinctrl 9 1>;
                };
                dsl_green {
                        label = "F@ST2704N:green:dsl";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&pinctrl 10 1>;
                };
                power_red {
                        label = "F@ST2704N:red:power";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&pinctrl 11 1>;
                };
                power_green {
                        label = "F@ST2704N:green:power";
-                       gpios = <&gpio1 15 1>;
+                       gpios = <&pinctrl 47 1>;
                        default-state = "on";
                };
                usb_green {
                        label = "F@ST2704N:green:usb";
-                       gpios = <&gpio1 17 1>;
+                       gpios = <&pinctrl 49 1>;
                };
        };
 };
+
+&hsspi {
+       status = "ok";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <62500000>;
+               spi-tx-bus-width = <2>;
+               spi-rx-bus-width = <2>;
+               reg = <0>;
+
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
+               };
+       };
+};
+
+&uart0 {
+       status = "ok";
+};