board/ls2081ardb: Update QSPI flash type from n25q512a to s25fs512s

As per updated board design, different QSPI flash
is connected on boards, hence change QSPI flash type
from Micron n25q512a device to spansion s25fs512s
device in dts and config.

Signed-off-by: Santan Kumar <santan.kumar@nxp.com>
Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com>
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts
index 6489362fc0ca8f446f34bdd9d91e39b2a7f347ac..aa4aa68c9c3d11075d94d25a3502502379f4b00d 100644 (file)
--- a/arch/arm/dts/fsl-ls2081a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2081a-rdb.dts
@@ -41,7 +41,7 @@
        bus-num = <0>;
        status = "okay";
 
-       qflash0: n25q512a@0 {
+       qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -49,7 +49,7 @@
                reg = <0>;
        };
 
-       qflash1: n25q512a@1 {
+       qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index e3012283357d408b58ac385fa772e490fe4fbd4c..8a89375a579ce71f6bc8a4be2205a2a1416b0582 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -288,19 +288,15 @@ unsigned long get_board_sys_clk(void);
 /* SPI */
 #if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI)
 #define CONFIG_SPI_FLASH
-#ifdef CONFIG_FSL_QSPI
+#ifdef CONFIG_FSL_DSPI
 #define CONFIG_SPI_FLASH_STMICRO
 #endif
 #ifdef CONFIG_FSL_QSPI
-#ifdef CONFIG_TARGET_LS2081ARDB
-#define CONFIG_SPI_FLASH_STMICRO
-#else
 #define CONFIG_SPI_FLASH_SPANSION
 #endif
 #define FSL_QSPI_FLASH_SIZE            SZ_64M  /* 64MB */
 #define FSL_QSPI_FLASH_NUM             2
 #endif
-#endif
 
 /*
  * RTC configuration