lantiq: Re-use the SPI node from vr9.dtsi in TDW89X0.dtsi

This removes the duplicate SPI register definition.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
SVN-Revision: 48287

diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 99b4ecb7cb85f356f437fd4db7d83aee8f699d8c..30225d5cc165c40317412ca8ac1c3332ccce1d67 100644 (file)
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -21,46 +21,6 @@
        };
 
        fpi@10000000 {
-               spi@E100800 {
-                       compatible = "lantiq,spi-xway";
-                       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 = <3 0>;
-                               spi-max-frequency = <33250000>;
-                               m25p,fast-read;
-
-                               partition@0 {
-                                       reg = <0x0 0x20000>;
-                                       label = "u-boot";
-                                       read-only;
-                               };
-
-                               partition@20000 {
-                                       reg = <0x20000 0x7a0000>;
-                                       label = "firmware";
-                               };
-
-                               partition@7c0000 {
-                                       reg = <0x7c0000 0x10000>;
-                                       label = "config";
-                                       read-only;
-                               };
-
-                               ath9k_cal: partition@7d0000 {
-                                       reg = <0x7d0000 0x30000>;
-                                       label = "boardconfig";
-                                       read-only;
-                               };
-                       };
-               };
-
                gpio: pinmux@E100B10 {
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
@@ -249,3 +209,39 @@
                };
        };
 };
+
+&spi {
+       status = "ok";
+
+       m25p80@3 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <3 0>;
+               spi-max-frequency = <33250000>;
+               m25p,fast-read;
+
+               partition@0 {
+                       reg = <0x0 0x20000>;
+                       label = "u-boot";
+                       read-only;
+               };
+
+               partition@20000 {
+                       reg = <0x20000 0x7a0000>;
+                       label = "firmware";
+               };
+
+               partition@7c0000 {
+                       reg = <0x7c0000 0x10000>;
+                       label = "config";
+                       read-only;
+               };
+
+               ath9k_cal: partition@7d0000 {
+                       reg = <0x7d0000 0x30000>;
+                       label = "boardconfig";
+                       read-only;
+               };
+       };
+};