[OpenWrt-Devel] [PATCH 07/13] lantiq: Enable SPI for the EASY80920 board again

[Martin Blumenstingl]

Also switch to the SPI definition provided by vr9.dtsi

Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
---
 target/linux/lantiq/dts/EASY80920.dtsi | 87 ++++++++++++++++------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index cf37e23..56efe71 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -32,52 +32,6 @@
 
 		};
 
-		spi at E100800 {
-			compatible = "lantiq,spi-xway-broken";
-			reg = <0xE100800 0x100>;
-			interrupt-parent = <&icu0>;
-			interrupts = <22 23 24>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			m25p80 at 0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "jedec,spi-nor";
-				reg = <0 0>;
-				spi-max-frequency = <1000000>;
-
-				partition at 0 {
-					reg = <0x0 0x20000>;
-					label = "SPI (RO) U-Boot Image";
-					read-only;
-				};
-
-				partition at 20000 {
-					reg = <0x20000 0x10000>;
-					label = "ENV_MAC";
-					read-only;
-				};
-
-				partition at 30000 {
-					reg = <0x30000 0x10000>;
-					label = "DPF";
-					read-only;
-				};
-
-				partition at 40000 {
-					reg = <0x40000 0x10000>;
-					label = "NVRAM";
-					read-only;
-				};
-
-				partition at 500000 {
-					reg = <0x50000 0x003a0000>;
-					label = "kernel";
-				};
-			};
-		};
-
 		gpio: pinmux at E100B10 {
 			compatible = "lantiq,pinctrl-xr9";
 			pinctrl-names = "default";
@@ -341,3 +295,44 @@
 		};
 	};
 };
+
+&spi {
+	status = "ok";
+
+	m25p80 at 3 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <3 0>;
+		spi-max-frequency = <1000000>;
+
+		partition at 0 {
+			reg = <0x0 0x20000>;
+			label = "SPI (RO) U-Boot Image";
+			read-only;
+		};
+
+		partition at 20000 {
+			reg = <0x20000 0x10000>;
+			label = "ENV_MAC";
+			read-only;
+		};
+
+		partition at 30000 {
+			reg = <0x30000 0x10000>;
+			label = "DPF";
+			read-only;
+		};
+
+		partition at 40000 {
+			reg = <0x40000 0x10000>;
+			label = "NVRAM";
+			read-only;
+		};
+
+		partition at 500000 {
+			reg = <0x50000 0x003a0000>;
+			label = "kernel";
+		};
+	};
+};
-- 
2.7.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel