kernel: m25p80: allow fallback from spi_flash_read to regular SPI transfer

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

diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts
index b923ee8dfd28dc0f12a902c13cf45bcfab222a64..f9331d4539f467e74f10b5fe95fe63c96bc4da75 100644 (file)
--- a/target/linux/brcm63xx/dts/magic.dts
+++ b/target/linux/brcm63xx/dts/magic.dts
@@ -8,43 +8,48 @@
        model = "Alice W-Gate";
        compatible = "telsey,magic", "brcm,bcm6348";
 
+       chosen {
+               bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
 
                power {
                        label = "MAGIC:green:power";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
 
                stop {
                        label = "MAGIC:green:stop";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&pinctrl 1 1>;
                };
 
                hpna {
                        label = "MAGIC:green:hpna";
-                       gpios = <&gpio0 4 1>;
+                       gpios = <&pinctrl 4 1>;
                };
 
                status {
                        label = "MAGIC:green:adsl";
-                       gpios = <&gpio0 5 1>;
+                       gpios = <&pinctrl 5 1>;
                };
 
                voip {
                        label = "MAGIC:green:voip";
-                       gpios = <&gpio0 22 1>;
+                       gpios = <&pinctrl 22 1>;
                };
 
                wifi {
                        label = "MAGIC:green:wifi";
-                       gpios = <&gpio0 28 0>;
+                       gpios = <&pinctrl 28 0>;
                };
 
                usb {
                        label = "MAGIC:green:usb";
-                       gpios = <&gpio1 3 1>;
+                       gpios = <&pinctrl 35 1>;
                };
        };
 };
@@ -54,19 +59,35 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
+
+               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 &pinctrl_mii_pccard>;
+};
+
+&uart0 {
+       status = "ok";
+};