SC594-SOM-EZKIT: Use QSPI as boot device (#5)

SC594-SOM-EZKIT: Use QSPI as boot device
analogdevicesinc · Oct 12, 2021 · e58c93a · e58c93a
1 parent 010de59
commit e58c93a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 42 deletions.
diff --git a/arch/arm/boot/dts/sc594-som-ezkit.dts b/arch/arm/boot/dts/sc594-som-ezkit.dts
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Device tree for ADI sc594-som-ezkit board
- *
- * Copyright 2014 - 2020 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- *
+ * Copyright 2014 - 2021 Analog Devices Inc.
  */
 
 /dts-v1/;
@@ -31,7 +28,7 @@
 			            <&ssw0 1 GPIO_ACTIVE_LOW>,	 /* LED */
 			            <&ssw0 2 GPIO_ACTIVE_LOW>,	 /* LED */
 			            <&ssw0 3 GPIO_ACTIVE_HIGH>,	 /* SPI2FLASH_CS */
-			            <&ssw0 4 GPIO_ACTIVE_LOW>,	 /* SPI2D2_D3_EN */
+			            <&ssw0 4 GPIO_ACTIVE_HIGH>,	 /* SPI2D2_D3_EN */
 			            <&ssw0 5 GPIO_ACTIVE_LOW>,	 /* UART0_EN */
 			            <&ssw0 6 GPIO_ACTIVE_LOW>,	 /* UART0_FLOW_EN */
 			            <&ssw0 7 GPIO_ACTIVE_HIGH>,	 /* OSPIFLASH_CS */
@@ -41,7 +38,7 @@
 			            <&ssw1 5 GPIO_ACTIVE_LOW>,	 /* ADAU_RESET */
 			            <&ssw1 6 GPIO_ACTIVE_HIGH>,	 /* ADAU1962_EN */
 			            <&ssw1 7 GPIO_ACTIVE_HIGH>,	 /* ADAU1979_EN */
-			            <&ssw1 8 GPIO_ACTIVE_LOW>,	 /* OCTAL_SPI_CS_EN */
+			            <&ssw1 8 GPIO_ACTIVE_HIGH>,	 /* OCTAL_SPI_CS_EN */
 			            <&ssw1 9 GPIO_ACTIVE_LOW>,	 /* SPDIF_DIGITAL_EN */
 			            <&ssw1 10 GPIO_ACTIVE_LOW>,	 /* SPDIF_OPTICAL_EN */
 			            <&ssw1 11 GPIO_ACTIVE_LOW>,	 /* AUDIO_JACK_SEL */
@@ -205,20 +202,44 @@
 		spi-cpha;
 		spi-rx-bus-width = <4>;
 
-		partition@0 {
-			label = "unallocated (is25lp512)";
-			reg = <0x0 0x2000000>;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-	};
+			spi_0: partition@0 {
+				label = "U-Boot";
+				reg = <0x0 0x80000>;
+			};
 
+			spi_1: partition@1 {
+				label = "U-Boot Environment";
+				reg = <0x80000 0x20000>;
+			};
+
+			spi_2: partition@2 {
+				label = "Device Tree Blob";
+				reg = <0xA0000 0x20000>;
+			};
+
+			spi_3: partition@3 {
+				label = "Kernel zImage";
+				reg = <0xC0000 0x600000>;
+			};
+
+			spi_4: partition@4 {
+				label = "JFFS2 Formatted RFS";
+				reg = <0x6C0000 0x3940000>;
+			};
+		};
+	};
 };
 
 &ospi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ospi_default>;
 
-	status = "okay";
+	status = "disabled";
 
 	flash0: is25lx256@0 {
 		#address-cells = <1>;
@@ -237,35 +258,9 @@
 		cdns,tchsh-ns = <4>;
 		cdns,tslch-ns = <4>;
 
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			ospi_0: partition@0 {
-				label = "U-Boot";
-				reg = <0x0 0x80000>;
-			};
-
-			ospi_1: partition@1 {
-				label = "U-Boot Environment";
-				reg = <0x80000 0x20000>;
-			};
-
-			ospi_2: partition@2 {
-				label = "Device Tree Blob";
-				reg = <0xA0000 0x20000>;
-			};
-
-			ospi_3: partition@3 {
-				label = "Kernel zImage";
-				reg = <0xC0000 0x600000>;
-			};
-
-			ospi_4: partition@4 {
-				label = "JFFS2 Formatted RFS";
-				reg = <0x6C0000 0x1940000>;
-			};
+		partition@0 {
+			label = "Unallocated";
+			reg = <0x0 0x2000000>;
 		};
 	};
 };

diff --git a/arch/arm/configs/sc594-som-ezkit_defconfig b/arch/arm/configs/sc594-som-ezkit_defconfig
@@ -59,6 +59,7 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_SPI_CADENCE_QUADSPI=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y