arm64: dts: stratix10: Backport QSPI DT node from upstream

The upstream Stratix10 QSPI device tree removed the unused bus-num node and added the partitions node with individual partitions as children. Backport the patch for consistency. [backport 'commit 490b7fd24dae ("arm64: dts: stratix10: Add QSPI support for Stratix10")'] Signed-off-by: Thor Thayer <[email protected]>
altera-opensource · May 30, 2018 · cdba831 · cdba831
1 parent 2b79991
commit cdba831
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -948,7 +948,6 @@
 			cdns,fifo-width = <4>;
 			cdns,trigger-address = <0x00000000>;
 			clocks = <&qspi_clk>;
-			bus-num = <1>;
 
 			status = "disabled";
 		};

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -143,10 +143,10 @@
 };
 
 &qspi {
-	flash0: n25q00@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "n25q00aa";
+		compatible = "n25q00a";
 		reg = <0>;
 		spi-max-frequency = <50000000>;
 
@@ -159,16 +159,20 @@
 		cdns,tchsh-ns = <4>;
 		cdns,tslch-ns = <4>;
 
-		partition@qspi-boot {
-			label = "Boot and fpga data";
-			/* 64MB for boot and FPGA data */
-			reg = <0x0 0x4000000>;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			qspi_boot: partition@0 {
+				label = "Boot and fpga data";
+				reg = <0x0 0x4000000>;
+			};
 
-		partition@qspi-rootfs {
-			label = "Root Filesystem - JFFS2";
-			/* 64MB for Linux jffs2 */
-			reg = <0x4000000 0x4000000>;
+			qspi_rootfs: partition@4000000 {
+				label = "Root Filesystem - JFFS2";
+				reg = <0x4000000 0x4000000>;
+			};
 		};
 	};
 };