kernel: remove a hack that was obsoleted upstream

[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 b9459c554e4cf91fb2e056eba28d9fb2db9a3956..569fa9f11c5c9cefb89dd84099a6ba675e98fabb 100644 (file)
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -2,7 +2,7 @@
 
 / {
        chosen {
-               bootargs-append = "root= console=ttyLTQ0,115200";
+               bootargs = "root= console=ttyLTQ0,115200";
 
                leds {
                        boot = &power_green;
@@ -45,15 +45,17 @@
                                        lantiq,output = <1>;
                                        lantiq,pull = <0>;
                                };
-                               spi-in {
-                                       lantiq,pins = "io16";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
+                       };
+                       pins_spi_default: pins_spi_default {
+                               spi_in {
+                                       lantiq,groups = "spi_di";
+                                       lantiq,function = "spi";
                                };
-                               spi-out {
-                                       lantiq,pins = "io10", "io17", "io18", "io21";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <2>;
+                               spi_out {
+                                       lantiq,groups = "spi_do", "spi_clk",
+                                               "spi_cs4";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
                                };
                        };
                };
@@ -78,50 +80,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>;
-
-                       partition@0 {
-                               reg = <0x0 0x10000>;
-                               label = "uboot";
-                               read-only;
-                       };
-
-                       partition@10000 {
-                               reg = <0x10000 0x10000>;
-                               label = "uboot-env";
-                               read-only;
-                       };
-
-                       ath9k_cal: partition@20000 {
-                               reg = <0x20000 0x10000>;
-                               label = "calibration";
-                               read-only;
-                       };
-
-                       partition@50000 {
-                               reg = <0x50000 0xfa0000>;
-                               label = "firmware";
-                       };
-               };
-       };
-
        ath9k_eep {
                compatible = "ath9k,eeprom";
                ath,eep-flash = <&ath9k_cal 0xf000>;
@@ -162,33 +120,83 @@
        gpio-leds {
                compatible = "gpio-leds";
                internet: internet {
-                       label = "internet";
+                       label = "dgn3500:green:internet";
                        gpios = <&gpio 2 1>;
                };
+               /*
+                       internet red is missing
+               */
                dsl: dsl {
-                       label = "dsl";
+                       label = "dgn3500:green:dsl";
                        gpios = <&gpio 4 1>;
                };
                usb: usb {
-                       label = "usb";
+                       label = "dgn3500:green:usb";
                        gpios = <&gpio 22 1>;
                };
                power_green: power {
-                       label = "power";
+                       label = "dgn3500:green:power";
                        gpios = <&gpio 34 1>;
                        default-state = "keep";
                };
                power_red: power2 {
-                       label = "power2";
+                       label = "dgn3500:red:power";
                        gpios = <&gpio 39 1>;
                };
+        /*
+                       power amber is missing
+               */
                wifi: wifi {
-                       label = "wifi";
+                       label = "dgn3500:blue:wireless";
                        gpios = <&gpio 51 1>;
                };
                wps {
-                       label = "wps";
+                       label = "dgn3500:green:wps";
                        gpios = <&gpio 52 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 = <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;
+                       };
+
+                       ath9k_cal: partition@20000 {
+                               reg = <0x20000 0x10000>;
+                               label = "calibration";
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               reg = <0x50000 0xfa0000>;
+                               label = "firmware";
+                       };
+               };
+       };
+};