From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 17 Jan 2016 19:55:31 +0000 (+0000)
Subject: lantiq: Switch FRITZ3370 from spi-gpio to the hardware SPI driver
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=be8f9ad6f47e90894327ac1658095ac5c591b8ef;p=openwrt%2Fstaging%2Fjow.git

lantiq: Switch FRITZ3370 from spi-gpio to the hardware SPI driver

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

SVN-Revision: 48288
---

diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 7344052c7d..c6a593bfed 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -68,7 +68,7 @@
 			state_default: pinmux {
 				spi {
 					lantiq,groups = "spi", "spi_cs4";
-					lantiq,function = "gpio";
+					lantiq,function = "spi";
 				};
 				mdio {
 					lantiq,groups = "mdio";
@@ -173,45 +173,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>;
-
-			ath9k_cal: partition@0 {
-				reg = <0x0 0x20000>;
-				label = "urlader";
-				read-only;
-			};
-
-			partition@20000 {
-				reg = <0x20000 0x10000>;
-				label = "tffs (1)";
-				read-only;
-			};
-
-			partition@30000 {
-				reg = <0x30000 0x10000>;
-				label = "tffs (2)";
-				read-only;
-			};
-		};
-	};
-
 	ath9k_eep {
 		compatible = "ath9k,eeprom";
 		ath,eep-flash = <&ath9k_cal 0x985>;
@@ -276,3 +237,33 @@
 		};
 	};
 };
+
+&spi {
+	status = "ok";
+
+	m25p80@3 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <3 0>;
+		spi-max-frequency = <1000000>;
+
+		ath9k_cal: partition@0 {
+			reg = <0x0 0x20000>;
+			label = "urlader";
+			read-only;
+		};
+
+		partition@20000 {
+			reg = <0x20000 0x10000>;
+			label = "tffs (1)";
+			read-only;
+		};
+
+		partition@30000 {
+			reg = <0x30000 0x10000>;
+			label = "tffs (2)";
+			read-only;
+		};
+	};
+};