lantiq: Use the correct SPI flash speed for the Netgear DGN3500

[openwrt/staging/dedeckeh.git] / target / linux / lantiq / dts / DGN3500.dtsi

diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index d43da9df040147473bb96a15e32452602944c3f8..1390158fce57be285647d7b53e32ddebdbfb3d92 100644 (file)
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -45,9 +45,17 @@
                                        lantiq,output = <1>;
                                        lantiq,pull = <0>;
                                };
-                               spi {
-                                       lantiq,groups = "spi", "spi_cs4";
+                       };
+                       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>;
                                };
                        };
                };
@@ -150,36 +158,45 @@
 };
 
 &spi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pins_spi_default>;
+
        status = "ok";
 
-       m25p80@3 {
+       m25p80@4 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               reg = <3 0>;
-               spi-max-frequency = <1000000>;
-
-               partition@0 {
-                       reg = <0x0 0x10000>;
-                       label = "uboot";
-                       read-only;
-               };
+               reg = <4 0>;
+               spi-max-frequency = <30000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               reg = <0x0 0x10000>;
+                               label = "uboot";
+                               read-only;
+                       };
 
-               partition@10000 {
-                       reg = <0x10000 0x10000>;
-                       label = "uboot-env";
-                       read-only;
-               };
+                       partition@10000 {
+                               reg = <0x10000 0x10000>;
+                               label = "uboot-env";
+                               read-only;
+                       };
 
-               ath9k_cal: partition@20000 {
-                       reg = <0x20000 0x10000>;
-                       label = "calibration";
-                       read-only;
-               };
+                       ath9k_cal: partition@20000 {
+                               reg = <0x20000 0x10000>;
+                               label = "calibration";
+                               read-only;
+                       };
 
-               partition@50000 {
-                       reg = <0x50000 0xfa0000>;
-                       label = "firmware";
+                       partition@50000 {
+                               reg = <0x50000 0xfa0000>;
+                               label = "firmware";
+                       };
                };
        };
 };