brcm63xx: drop linux,part-probe usage where possible

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

diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts
index c6b71d1cde0b0469713f5826fc9711708bbd0841..ad8093c6a4801b3b7794d9d6511a1919174e3b39 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2604.dts
+++ b/target/linux/brcm63xx/dts/fast2604.dts
@@ -8,6 +8,11 @@
        model = "Sagem F@ST2604";
        compatible = "sagem,f@st2604", "brcm,bcm6348";
 
+       chosen {
+               bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
@@ -17,7 +22,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 1 1>;
+                       gpios = <&pinctrl 33 1>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -27,20 +32,20 @@
 
                power_green {
                        label = "F@ST2604:green:power";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                power_red {
                        label = "F@ST2604:red:power";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&pinctrl 1 1>;
                };
                inet_red {
                        label = "F@ST2604:red:inet";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                };
                wps_green {
                        label = "F@ST2604:green:wps";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
        };
 };
@@ -48,21 +53,35 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
+
+&pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
+};
+
+&uart0 {
+       status = "ok";
+};