lantiq: Enable SPI for the EASY80920 board again

[openwrt.git] / target / linux / lantiq / dts / EASY80920.dtsi

diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 14a020f..56efe71 100644 (file)
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -32,52 +32,6 @@
 
                };
 
-               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 = "jedec,spi-nor";
-                               reg = <0 0>;
-                               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 {
                        compatible = "lantiq,pinctrl-xr9";
                        pinctrl-names = "default";
@@ -303,41 +257,82 @@
                compatible = "gpio-leds";
 
                power: power {
-                       label = "power";
+                       label = "easy80920:green:power";
                        gpios = <&stp 9 0>;
                        default-state = "keep";
                };
                warning {
-                       label = "warning";
+                       label = "easy80920:green:warning";
                        gpios = <&stp 22 0>;
                };
                fxs1 {
-                       label = "fxs1";
+                       label = "easy80920:green:fxs1";
                        gpios = <&stp 21 0>;
                };
                fxs2 {
-                       label = "fxs2";
+                       label = "easy80920:green:fxs2";
                        gpios = <&stp 20 0>;
                };
                fxo {
-                       label = "fxo";
+                       label = "easy80920:green:fxo";
                        gpios = <&stp 19 0>;
                };
                usb1: usb1 {
-                       label = "usb1";
+                       label = "easy80920:green:usb1";
                        gpios = <&stp 18 0>;
                };
                usb2: usb2 {
-                       label = "usb2";
+                       label = "easy80920:green:usb2";
                        gpios = <&stp 15 0>;
                };
                sd {
-                       label = "sd";
+                       label = "easy80920:green:sd";
                        gpios = <&stp 14 0>;
                };
                wps {
-                       label = "wps";
+                       label = "easy80920:green:wps";
                        gpios = <&stp 12 0>;
                };
        };
 };
+
+&spi {
+       status = "ok";
+
+       m25p80@3 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <3 0>;
+               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";
+               };
+       };
+};