Correct naming of Spansion part. S25FL1, not ST25FL1

configs @ f475b050

-Subproject commit 8e4edaaa0293ae3ca1517f6798694d8e96c553bb
+Subproject commit f475b05030ef74cea1941774716b2ba0af1c97ae

drivers/mtd/Kconfig

@@ -395,18 +395,18 @@ config M25P_SUBSECTOR_ERASE
 
 endif
 
-config MTD_ST25FL1
-	bool "QuadSPI-based ST25FL1 FLASH"
+config MTD_S25FL1
+	bool "QuadSPI-based S25FL1 FLASH"
 	default n
 
-if MTD_ST25FL1
+if MTD_S25FL1
 
-config ST25FL1_QSPIMODE
-	int "ST25FL1 QuadSPI Mode"
+config S25FL1_QSPIMODE
+	int "S25FL1 QuadSPI Mode"
 	default 0
 
-config ST25FL1_QSPI_FREQUENCY
-	int "ST25FL1 QuadSPI Frequency"
+config S25FL1_QSPI_FREQUENCY
+	int "S25FL1 QuadSPI Frequency"
 	default 108000000
 	---help---
 		Per data sheet:
@@ -430,20 +430,20 @@ config ST25FL1_QSPI_FREQUENCY
 
 		In this implementation, only "Quad" reads are performed.
 
-config ST25FL1_SECTOR512
+config S25FL1_SECTOR512
 	bool "Simulate 512 byte Erase Blocks"
 	default n
 
-config ST25FL1_SCRAMBLE
+config S25FL1_SCRAMBLE
 	bool "Scramble data"
 	default n
 	---help---
 		Requires drviver support for data scrambling/descrambling.
 
-config ST25FL1_SCRAMBLE_KEY
+config S25FL1_SCRAMBLE_KEY
 	hex "Scramble key"
 	default 0x0baddead
-	depends on ST25FL1_SCRAMBLE
+	depends on S25FL1_SCRAMBLE
 
 endif
 

drivers/mtd/Make.defs

@@ -92,8 +92,8 @@ ifeq ($(CONFIG_MTD_AT25),y)
 CSRCS += at25.c
 endif
 
-ifeq ($(CONFIG_MTD_ST25FL1),y)
-CSRCS += st25fl1.c
+ifeq ($(CONFIG_MTD_S25FL1),y)
+CSRCS += s25fl1.c
 endif
 
 ifeq ($(CONFIG_MTD_SMART),y)

include/nuttx/mtd/mtd.h

@@ -475,7 +475,7 @@ FAR struct mtd_dev_s *sst39vf_initialize(void);
 FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *dev);
 
 /****************************************************************************
- * Name: st25fl1_initialize
+ * Name: s25fl1_initialize
  *
  * Description:
  *   Create an initialize MTD device instance for the QuadSPI-based ST24FL1
@@ -484,7 +484,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *dev);
  ****************************************************************************/
 
 struct qspi_dev_s; /* Forward reference */
-FAR struct mtd_dev_s *st25fl1_initialize(FAR struct qspi_dev_s *qspi);
+FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi);
 
 /****************************************************************************
  * Name: up_flashinitialize