lantiq: Switch to the new SPI driver

[openwrt.git] / target / linux / lantiq / dts / FRITZ3370.dts

diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index dd323dd..648e36b 100644 (file)
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -6,7 +6,17 @@
        model = "FRITZ3370 - Fritz!Box WLAN 3370";
 
        chosen {
-               bootargs = "console=ttyLTQ0,115200 init=/etc/preinit rootfstype=jffs2";
+               bootargs = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9";
+
+               leds {
+                       boot = &power_green;
+                       failsafe = &power_red;
+                       running = &power_green;
+
+                       dsl = &dsl;
+                       internet = &info_green;
+                       wifi = &wifi;
+               };
        };
 
        memory@0 {
@@ -24,11 +34,11 @@
 
                                partition@0 {
                                        label = "kernel";
-                                       reg = <0x00000 0x400000>;
+                                       reg = <0x0 0x400000>;
                                };
 
                                partition@400000 {
-                                       label = "rootfs";
+                                       label = "rootfs_ubi";
                                        reg = <0x400000 0x3000000>;
                                };
 
@@ -51,79 +61,21 @@
                        };
                };
 
-               spi@E100800 {
-                       compatible = "lantiq,spi-xway-broken";
-                       reg = <0xE100800 0x100>;
-                       interrupt-parent = <&icu0>;
-                       interrupts = <22 23 24>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "s25fl129p0";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <1000000>;
-
-                               partition@0 {
-                                       reg = <0x0 0x20000>;
-                                       label = "SPI (RO) U-Boot Image";
-                                       read-only;
-                               };
-
-                               partition@20000 {
-                                       reg = <0x20000 0x10000>;
-                                       label = "ENV_MAC";
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       reg = <0x30000 0x10000>;
-                                       label = "DPF";
-                                       read-only;
-                               };
-
-                               partition@40000 {
-                                       reg = <0x40000 0x10000>;
-                                       label = "NVRAM";
-                                       read-only;
-                               };
-
-                               partition@500000 {
-                                       reg = <0x50000 0x003a0000>;
-                                       label = "kernel";
-                               };
-                       };
-               };
-
                gpio: pinmux@E100B10 {
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
                        state_default: pinmux {
-                               spi {
-                                       lantiq,groups = "spi", "spi_cs4";
-                                       lantiq,function = "spi";
-                               };
-                               nand_out {
-                                       lantiq,groups = "nand cle", "nand ale", "nand rd", "ebu a23", "ebu a24";
-                                       lantiq,function = "ebu";
-                                       lantiq,direction = <1>;
-                                       lantiq,pull = <0>;
-                               };
-                               nand_in {
-                                       lantiq,groups = "nand rdy";
-                                       lantiq,function = "ebu";
-                                       lantiq,direction = <0>;
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                               };
                                mdio {
                                        lantiq,groups = "mdio";
                                        lantiq,function = "mdio";
                                };
+                               nand {
+                                       lantiq,groups = "nand cle", "nand ale",
+                                                       "nand rd", "nand cs1", "nand rdy";
+                                       lantiq,function = "ebu";
+                                       lantiq,pull = <1>;
+                               };
                                phy-rst {
                                        lantiq,pins = "io37", "io44";
                                        lantiq,pull = <0>;
@@ -136,6 +88,18 @@
                                        lantiq,output = <1>;
                                };
                        };
+                       pins_spi_default: pins_spi_default {
+                               spi_in {
+                                       lantiq,groups = "spi_di";
+                                       lantiq,function = "spi";
+                               };
+                               spi_out {
+                                       lantiq,groups = "spi_do", "spi_clk",
+                                               "spi_cs4";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
                };
 
                eth@E108000 {
@@ -156,6 +120,7 @@
                                #size-cells = <0>;
                                reg = <0>;
                                mac-address = [ 00 11 22 33 44 55 ];
+                               lantiq,switch;
 
                                ethernet@0 {
                                        compatible = "lantiq,xrx200-pdi-port";
@@ -192,22 +157,18 @@
                                phy0: ethernet-phy@0 {
                                        reg = <0x0>;
                                        compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-                                       lantiq,c45-reg-init = <1 0 0 0>;
                                };
                                phy1: ethernet-phy@1 {
                                        reg = <0x1>;
                                        compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-                                       lantiq,c45-reg-init = <1 0 0 0>;
                                };
                                phy11: ethernet-phy@11 {
                                        reg = <0x11>;
                                        compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-                                       lantiq,c45-reg-init = <1 0 0 0>;
                                };
                                phy13: ethernet-phy@13 {
                                        reg = <0x13>;
                                        compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-                                       lantiq,c45-reg-init = <1 0 0 0>;
                                };
                        };
                };
@@ -220,6 +181,13 @@
                };
        };
 
+       ath9k_eep {
+               compatible = "ath9k,eeprom";
+               ath,eep-flash = <&ath9k_cal 0x985>;
+               ath,eep-endian;
+               ath,eep-swap;
+       };
+
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
                firmware = "lantiq/vr9_phy11g_a1x.bin";
@@ -246,33 +214,67 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               power {
-                       label = "power";
+               power_green: power {
+                       label = "fritz3370:green:power";
                        gpios = <&gpio 32 1>;
+                       default-state = "keep";
                };
-               power2 {
-                       label = "power2";
+               power_red: power2 {
+                       label = "fritz3370:red:power";
                        gpios = <&gpio 33 1>;
                };
                info_red {
-                       label = "info_red";
+                       label = "fritz3370:red:info";
                        gpios = <&gpio 34 1>;
                };
-               wifi {
-                       label = "wifi";
+               wifi: wifi {
+                       label = "fritz3370:green:wlan";
                        gpios = <&gpio 35 1>;
                };
-               dsl {
-                       label = "dsl";
+               dsl: dsl {
+                       label = "fritz3370:green:dsl";
                        gpios = <&gpio 36 1>;
                };
                lan {
-                       label = "lan";
+                       label = "fritz3370:green:lan";
                        gpios = <&gpio 38 1>;
                };
-               info_green {
-                       label = "info_green";
+               info_green: info_green {
+                       label = "fritz3370:green:info";
                        gpios = <&gpio 47 1>;
                };
        };
 };
+
+&spi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pins_spi_default>;
+
+       status = "ok";
+
+       m25p80@4 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <4 0>;
+               spi-max-frequency = <1000000>;
+
+               ath9k_cal: partition@0 {
+                       reg = <0x0 0x20000>;
+                       label = "urlader";
+                       read-only;
+               };
+
+               partition@20000 {
+                       reg = <0x20000 0x10000>;
+                       label = "tffs (1)";
+                       read-only;
+               };
+
+               partition@30000 {
+                       reg = <0x30000 0x10000>;
+                       label = "tffs (2)";
+                       read-only;
+               };
+       };
+};