ramips: cleanup dts files of mt7621 based boards

Fix a typo in mt7621.dtsi compatible string. Disable spi, sdhci and pci
in mt7621.dtsi and enable the nodes in the indiviual board dts files.
The nodes require further device specific configuration anyway.

Remove the m25p80@0 spi child node from mt7621.dtsi and add the
chunked-io parameter to the individual board dts files. Fix the spi
flash compatible string for the WNDR3700V5.

Drop the mt7621-eval-board compatible string for all boards which are
not the eval board.

Drop the linux,modalias parameter from spi flash node.

Remove the xhci node from board files, it is already enabled in dtsi.
Disable xhci for boards not having usb ports populated.

Signed-off-by: Mathias Kresin <[email protected]>

target/linux/ramips/dts/DIR-860L-B1.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "D-Link DIR-860L B1";
 
 	memory@0 {
@@ -69,8 +68,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/FIREWRT.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Firefly FireWRT";
 
 	memory@0 {
@@ -58,8 +57,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/MT7621.dts

@@ -14,35 +14,33 @@
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
+};
 
-	nand@1e003000 {
-		partition@0 {
-			label = "uboot";
-			reg = <0x00000 0x80000>; /* 64 KB */
-		};
+&nand {
+	status = "okay";
 
-		partition@80000 {
-			label = "uboot_env";
-			reg = <0x80000 0x80000>; /* 64 KB */
-		};
+	partition@0 {
+		label = "uboot";
+		reg = <0x00000 0x80000>; /* 64 KB */
+	};
 
-		partition@100000 {
-			label = "factory";
-			reg = <0x100000 0x40000>;
-		};
+	partition@80000 {
+		label = "uboot_env";
+		reg = <0x80000 0x80000>; /* 64 KB */
+	};
 
-		partition@140000 {
-			label = "rootfs";
-			reg = <0x140000 0xec0000>;
-		};
+	partition@100000 {
+		label = "factory";
+		reg = <0x100000 0x40000>;
 	};
-};
 
-&sdhci {
-	status = "okay";
+	partition@140000 {
+		label = "rootfs";
+		reg = <0x140000 0xec0000>;
+	};
 };
 
-&xhci {
+&sdhci {
 	status = "okay";
 };
 

target/linux/ramips/dts/Newifi-D1.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Newifi-D1";
 
 	memory@0 {
@@ -69,14 +68,11 @@
 
 &sdhci {
 	status = "okay";
+
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdhci_pins>;
 };
 
-&xhci {
-	status = "okay";
-};
-
 &spi0 {
 	status = "okay";
 
@@ -85,8 +81,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -139,8 +135,6 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-
-
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {

target/linux/ramips/dts/PBR-M1.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "PBR-M1";
 
 	memory@0 {
@@ -106,10 +105,6 @@
 	pinctrl-0 = <&sdhci_pins>;
 };
 
-&xhci {
-	status = "okay";
-};
-
 &spi0 {
 	status = "okay";
 
@@ -118,8 +113,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -172,8 +167,6 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-
-
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {

target/linux/ramips/dts/RB750Gr3.dts

@@ -1,11 +1,11 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
+
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "MikroTik RB750Gr3";
 
 	memory@0 {
@@ -65,8 +65,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -111,11 +111,3 @@
 &sdhci {
 	status = "okay";
 };
-
-&xhci {
-	status = "okay";
-};
-
-&pcie {
-	status = "disabled";
-};

target/linux/ramips/dts/RE6500.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Linksys RE6500";
 
 	memory@0 {
@@ -59,8 +58,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -121,3 +120,7 @@
 &ethernet {
 	mtd-mac-address = <&factory 0x2e>;
 };
+
+&xhci {
+	status = "disabled";
+};

target/linux/ramips/dts/SAP-G3200U3.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "STORYLiNK SAP-G3200U3";
 
 	memory@0 {
@@ -54,8 +53,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/SK-WB8.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "SamKnows Whitebox 8";
 
 	memory@0 {
@@ -57,8 +56,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/Timecloud.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Thunder Timecloud";
 
 	memory@0 {
@@ -54,14 +53,11 @@
 
 &sdhci {
 	status = "okay";
+
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdhci_pins>;
 };
 
-&xhci {
-	status = "okay";
-};
-
 &spi0 {
 	status = "okay";
 
@@ -70,8 +66,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/UBNT-ERX.dts

@@ -5,7 +5,6 @@
 #include "mt7621.dtsi"
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "UBNT-ERX";
 
 	memory@0 {
@@ -17,43 +16,6 @@
 		bootargs = "console=ttyS0,57600";
 	};
 
-	nand@1e003000 {
-		status = "okay";
-
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x80000>;
-			read-only;
-		};
-
-		partition@80000 {
-			label = "u-boot-env";
-			reg = <0x80000 0x60000>;
-			read-only;
-		};
-
-		factory: partition@e0000 {
-			label = "factory";
-			reg = <0xe0000 0x60000>;
-		};
-
-		partition@140000 {
-			label = "kernel1";
-			reg = <0x140000 0x300000>;
-		};
-
-		partition@440000 {
-			label = "kernel2";
-			reg = <0x440000 0x300000>;
-		};
-
-		partition@740000 {
-			label = "ubi";
-			reg = <0x740000 0xf7c0000>;
-		};
-
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -72,6 +34,42 @@
 	mtd-mac-address = <&factory 0x22>;
 };
 
+&nand {
+	status = "okay";
+
+	partition@0 {
+		label = "u-boot";
+		reg = <0x0 0x80000>;
+		read-only;
+	};
+
+	partition@80000 {
+		label = "u-boot-env";
+		reg = <0x80000 0x60000>;
+		read-only;
+	};
+
+	factory: partition@e0000 {
+		label = "factory";
+		reg = <0xe0000 0x60000>;
+	};
+
+	partition@140000 {
+		label = "kernel1";
+		reg = <0x140000 0x300000>;
+	};
+
+	partition@440000 {
+		label = "kernel2";
+		reg = <0x440000 0x300000>;
+	};
+
+	partition@740000 {
+		label = "ubi";
+		reg = <0x740000 0xf7c0000>;
+	};
+};
+
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
@@ -81,27 +79,20 @@
 	};
 };
 
-&sdhci {
-	status = "disabled";
-};
-
-&pcie {
-	status = "disabled";
-};
-
 &spi0 {
 	/* This board has 2Mb spi flash soldered in and visible
 	   from manufacturer's firmware.
 	   But this SoC shares spi and nand pins,
 	   and current driver does't handle this sharing well */
 	status = "disabled";
+
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <1>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "spi";
@@ -110,3 +101,7 @@
 		};
 	};
 };
+
+&xhci {
+	status = "disabled";
+};

target/linux/ramips/dts/VR500.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "Planex VR500";
 
 	memory@0 {
@@ -40,10 +39,6 @@
 	};
 };
 
-&xhci {
-	status = "okay";
-};
-
 &spi0 {
 	status = "okay";
 
@@ -52,8 +47,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -88,7 +83,3 @@
 		};
 	};
 };
-
-&pcie {
-	status = "disabled";
-};

target/linux/ramips/dts/WF-2881.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "NETIS WF-2881";
 
 	memory@0 {
@@ -17,39 +16,6 @@
 		bootargs = "console=ttyS0,57600";
 	};
 
-	nand@1e003000 {
-		status = "okay";
-
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition@30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x1000>;
-			read-only;
-		};
-
-		partition@80000 {
-			label = "config";
-			reg = <0x80000 0x80000>;
-			read-only;
-		};
-
-		factory: partition@100000 {
-			label = "factory";
-			reg = <0x100000 0x40000>;
-			read-only;
-		};
-
-		partition@140000 {
-			label = "firmware";
-			reg = <0x140000 0x7E40000>;
-		};
-	};
-
 	gpio-leds {
 		compatible = "gpio-leds";
 
@@ -78,8 +44,37 @@
 	};
 };
 
-&spi0 {
-	status="disabled";
+&nand {
+	status = "okay";
+
+	partition@0 {
+		label = "u-boot";
+		reg = <0x0 0x30000>;
+		read-only;
+	};
+
+	partition@30000 {
+		label = "u-boot-env";
+		reg = <0x30000 0x1000>;
+		read-only;
+	};
+
+	partition@80000 {
+		label = "config";
+		reg = <0x80000 0x80000>;
+		read-only;
+	};
+
+	factory: partition@100000 {
+		label = "factory";
+		reg = <0x100000 0x40000>;
+		read-only;
+	};
+
+	partition@140000 {
+		label = "firmware";
+		reg = <0x140000 0x7E40000>;
+	};
 };
 
 &pcie {

target/linux/ramips/dts/WITI.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "MQmaker WiTi";
 
 	memory@0 {
@@ -43,15 +42,10 @@
 	};
 };
 
-
 &sdhci {
 	status = "okay";
 };
 
-&xhci {
-	status = "okay";
-};
-
 &spi0 {
 	status = "okay";
 
@@ -60,8 +54,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/WNDR3700V5.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board","ralink,mt7621-soc";
 	model = "Netgear WNDR3700v5";
 
 	memory@0 {
@@ -71,13 +70,13 @@
 &spi0 {
 	status = "okay";
 
-	m25p80@0 {
+	mx25l12805d@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mx25l12805d";
+		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/WSR-1166.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "Buffalo WSR-1166DHP";
 
 	memory@0 {
@@ -121,8 +120,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -184,3 +183,7 @@
 		};
 	};
 };
+
+&xhci {
+	status = "disabled";
+};

target/linux/ramips/dts/WSR-600.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "Buffalo WSR-600DHP";
 
 	memory@0 {
@@ -121,8 +120,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
@@ -157,3 +156,7 @@
 		};
 	};
 };
+
+&xhci {
+	status = "disabled";
+};

target/linux/ramips/dts/ZBT-WG2626.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "ZBT-WG2626";
 
 	memory@0 {
@@ -58,8 +57,8 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/ZBT-WG3526.dtsi

@@ -54,6 +54,7 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";

target/linux/ramips/dts/mt7621.dtsi

@@ -3,7 +3,7 @@
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
-	compatible = "mediatek,mtk7621-soc";
+	compatible = "mediatek,mt7621-soc";
 
 	cpus {
 		cpu@0 {
@@ -160,7 +160,7 @@
 		};
 
 		spi0: spi@b00 {
-			status = "okay";
+			status = "disabled";
 
 			compatible = "ralink,mt7621-spi";
 			reg = <0xb00 0x100>;
@@ -175,14 +175,6 @@
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
-
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				reg = <0>;
-				spi-max-frequency = <10000000>;
-				m25p,chunked-io = <32>;
-			};
 		};
 
 		gdma: gdma@2800 {
@@ -322,6 +314,8 @@
 	};
 
 	sdhci: sdhci@1E130000 {
+		status = "disabled";
+
 		compatible = "ralink,mt7620-sdhci";
 		reg = <0x1E130000 0x4000>;
 
@@ -427,7 +421,7 @@
 				GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH
 				GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
 
-		status = "okay";
+		status = "disabled";
 
 		resets = <&rstctrl 24 &rstctrl 25 &rstctrl 26>;
 		reset-names = "pcie0", "pcie1", "pcie2";