mediatek: change dts to use the new snand driver

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

3 files changed, 79 insertions, 113 deletions

diff --git a/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts b/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
index 2f3e5b1fb0..867982b061 100644
--- a/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
+++ b/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
@@ -430,10 +430,6 @@
 	};
 };
 
-&bch {
-	status = "okay";
-};
-
 &btif {
 	status = "disabled";
 };
@@ -501,62 +497,55 @@
 	status = "okay";
 };
 
-&snfi {
+&snand {
+	mediatek,quad-spi;
 	pinctrl-names = "default";
 	pinctrl-0 = <&serial_nand_pins>;
 	status = "okay";
 
-	spi_nand@0 {
+	partitions {
+		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <104000000>;
-		reg = <0>;
 
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "Preloader";
-				reg = <0x00000 0x0080000>;
-				read-only;
-			};
-
-			partition@80000 {
-				label = "ATF";
-				reg = <0x80000 0x0040000>;
-				read-only;
-			};
-
-			partition@c0000 {
-				label = "uboot";
-				reg = <0xc0000 0x0080000>;
-				read-only;
-			};
-
-			partition@140000 {
-				label = "uboot-env";
-				reg = <0x140000 0x0080000>;
-				read-only;
-			};
-
-			factory: partition@1c0000 {
-				label = "factory";
-				reg = <0x1c0000 0x0040000>;
-				read-only;
-			};
-
-			partition@200000 {
-				label = "firmware";
-				reg = <0x200000 0x2000000>;
-			};
-
-			partition@2200000 {
-				label = "reserved";
-				reg = <0x2200000 0x4000000>;
-			};
+		partition@0 {
+			label = "Preloader";
+			reg = <0x00000 0x0080000>;
+			read-only;
+		};
+
+		partition@80000 {
+			label = "ATF";
+			reg = <0x80000 0x0040000>;
+			read-only;
+		};
+
+		partition@c0000 {
+			label = "uboot";
+			reg = <0xc0000 0x0080000>;
+			read-only;
+		};
+
+		partition@140000 {
+			label = "uboot-env";
+			reg = <0x140000 0x0080000>;
+			read-only;
+		};
+
+		factory: partition@1c0000 {
+			label = "factory";
+			reg = <0x1c0000 0x0040000>;
+			read-only;
+		};
+
+		partition@200000 {
+			label = "firmware";
+			reg = <0x200000 0x2000000>;
+		};
+
+		partition@2200000 {
+			label = "reserved";
+			reg = <0x2200000 0x4000000>;
 		};
 	};
 };
diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
index 1e367d408f..7358b94a8e 100644
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
@@ -110,10 +110,6 @@
 	};
 };
 
-&bch {
-	status = "okay";
-};
-
 &btif {
 	status = "okay";
 };
@@ -342,18 +338,11 @@
 	};
 };
 
-&snfi {
+&snand {
+	mediatek,quad-spi;
 	pinctrl-names = "default";
 	pinctrl-0 = <&serial_nand_pins>;
 	status = "okay";
-
-	snand: spi_nand@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <104000000>;
-		reg = <0>;
-	};
 };
 
 &spi0 {
diff --git a/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts b/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts
index a54e710924..3816dcb9cc 100644
--- a/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts
+++ b/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts
@@ -6,63 +6,51 @@
 	compatible = "mediatek,mt7622,ubi";
 };
 
-&snfi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&serial_nand_pins>;
-	status = "okay";
-
-	spi_nand@0 {
+&snand {
+	partitions {
+		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <104000000>;
-		reg = <0>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
 
-			partition@0 {
-				label = "Preloader";
-				reg = <0x00000 0x0080000>;
-				read-only;
-			};
+		partition@0 {
+			label = "Preloader";
+			reg = <0x00000 0x0080000>;
+			read-only;
+		};
 
-			partition@80000 {
-				label = "ATF";
-				reg = <0x80000 0x0040000>;
-			};
+		partition@80000 {
+			label = "ATF";
+			reg = <0x80000 0x0040000>;
+		};
 
-			partition@c0000 {
-				label = "Bootloader";
-				reg = <0xc0000 0x0080000>;
-			};
+		partition@c0000 {
+			label = "Bootloader";
+			reg = <0xc0000 0x0080000>;
+		};
 
-			partition@140000 {
-				label = "Config";
-				reg = <0x140000 0x0080000>;
-			};
+		partition@140000 {
+			label = "Config";
+			reg = <0x140000 0x0080000>;
+		};
 
-			factory: partition@1c0000 {
-				label = "Factory";
-				reg = <0x1c0000 0x0040000>;
-			};
+		factory: partition@1c0000 {
+			label = "Factory";
+			reg = <0x1c0000 0x0040000>;
+		};
 
-			partition@200000 {
-				label = "kernel";
-				reg = <0x200000 0x400000>;
-			};
+		partition@200000 {
+			label = "kernel";
+			reg = <0x200000 0x400000>;
+		};
 
-			partition@600000 {
-				label = "ubi";
-				reg = <0x600000 0x1C00000>;
-			};
+		partition@600000 {
+			label = "ubi";
+			reg = <0x600000 0x1C00000>;
+		};
 
-			partition@2200000 {
-				label = "User_data";
-				reg = <0x2200000 0x4000000>;
-			};
+		partition@2200000 {
+			label = "User_data";
+			reg = <0x2200000 0x4000000>;
 		};
 	};
 };