lantiq: Switch to the new SPI driver

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

diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 91eb7b60b7fa77cdcdf27c2aead8ea5fe0e4b751..648e36bcf0d85ff577f6829b074abd1f467abc0e 100644 (file)
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -7,6 +7,16 @@
 
        chosen {
                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 {
@@ -56,10 +66,6 @@
                        pinctrl-0 = <&state_default>;
 
                        state_default: pinmux {
-                               spi {
-                                       lantiq,groups = "spi", "spi_cs4";
-                                       lantiq,function = "gpio";
-                               };
                                mdio {
                                        lantiq,groups = "mdio";
                                        lantiq,function = "mdio";
@@ -82,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 {
@@ -163,45 +181,6 @@
                };
        };
 
-       spi {
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               compatible = "spi-gpio";
-
-               gpio-miso = <&gpio 16 0>;
-               gpio-mosi = <&gpio 17 0>;
-               gpio-sck = <&gpio 18 0>;
-               num-chipselects = <1>;
-               cs-gpios = <&gpio 10 1>;
-
-               m25p80@0 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "jedec,spi-nor";
-                       reg = <0 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;
-                       };
-               };
-       };
-
        ath9k_eep {
                compatible = "ath9k,eeprom";
                ath,eep-flash = <&ath9k_cal 0x985>;
@@ -235,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;
+               };
+       };
+};