spi: zynq_qspi: Rename CONFIG_ZYNQ_SPI to CONFIG_ZYNQ_QSPI

As zynq_qspi.c is qspi controller driver, hence renamed
CONFIG_ZYNQ_SPI => CONFIG_ZYNQ_QSPI

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 0893c1b5422ae002f4832a9b6b22b8df0eb3cf7e..866d7558fe8aa93ed0d0b61161c6385f19498c01 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -55,7 +55,7 @@ COBJS-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o
 COBJS-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o
 COBJS-$(CONFIG_TEGRA114_SPI) += tegra114_spi.o
 COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o
-COBJS-$(CONFIG_ZYNQ_SPI) += zynq_qspi.o
+COBJS-$(CONFIG_ZYNQ_QSPI) += zynq_qspi.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/include/configs/petalinux-auto-board.h.template b/include/configs/petalinux-auto-board.h.template
index 56aa15eadbbe53483f9862ffe4006fe7a4730fe3..4464cf91bea7415f38d3d36a417579ef1bd09e19 100644 (file)
--- a/include/configs/petalinux-auto-board.h.template
+++ b/include/configs/petalinux-auto-board.h.template
@@ -309,7 +309,7 @@
                #define CONFIG_ENV_SIZE         @besize@
 #elif defined(XILINX_SPI_FLASH_BASEADDR) /* SPI Flash */
        #if defined(XILINX_PS7_QSPI_FLASH_BASEADDR)
-               #define CONFIG_ZYNQ_SPI
+               #define CONFIG_ZYNQ_QSPI
                #define CONFIG_CMD_SPI
                #define CONFIG_ENV_SPI_MAX_HZ   XILINX_SPI_FLASH_MAX_FREQ
                #define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ

diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h
index 7339fbc552b7f9ceb756bfb43ed9b4fd5053ce6f..fe88cdf64dcdeb42eaef5675241b9051bc122388 100644 (file)
--- a/include/configs/zynq_afx.h
+++ b/include/configs/zynq_afx.h
@@ -26,7 +26,7 @@
 #if defined(CONFIG_AFX_NOR)
 # undef CONFIG_SYS_NO_FLASH
 #elif defined(CONFIG_AFX_QSPI)
-# define CONFIG_ZYNQ_SPI
+# define CONFIG_ZYNQ_QSPI
 #elif defined(CONFIG_AFX_NAND)
 # define CONFIG_NAND_ZYNQ
 #endif

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 75b381c00e91c696291e1a24018225c75c603031..97a8f7bc9c957db2100c73016ce5e8efeb249667 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -121,7 +121,7 @@
 #endif
 
 /* QSPI */
-#ifdef CONFIG_ZYNQ_SPI
+#ifdef CONFIG_ZYNQ_QSPI
 # define CONFIG_SF_DEFAULT_SPEED       30000000
 # define CONFIG_SPI_FLASH
 # define CONFIG_SPI_FLASH_SPANSION
@@ -177,7 +177,7 @@
 # ifndef CONFIG_SYS_NO_FLASH
 /* Environment in NOR flash */
 #  define CONFIG_ENV_IS_IN_FLASH
-# elif defined(CONFIG_ZYNQ_SPI)
+# elif defined(CONFIG_ZYNQ_QSPI)
 /* Environment in Serial Flash */
 #  define CONFIG_ENV_IS_IN_SPI_FLASH
 # elif defined(CONFIG_NAND_ZYNQ)

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 8fe3af23d84f1340e29e18f19bfcad8c28dc4c6c..37c48066d91c68728bafdf98857d8fc426084086 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -27,7 +27,7 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_ZYNQ_SPI
+#define CONFIG_ZYNQ_QSPI
 #define CONFIG_ZYNQ_I2C
 #define CONFIG_ZYNQ_EEPROM
 

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 0e27a438fe1426c8f037260aa4de9db430af14c3..190781f02a49b1a697dcbe0e6bd408ffaa066860 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -27,7 +27,7 @@
 # define CONFIG_ZYNQ_GEM0
 # define CONFIG_ZYNQ_GEM_PHY_ADDR0     7
 # define CONFIG_ZYNQ_SDHCI0
-# define CONFIG_ZYNQ_SPI
+# define CONFIG_ZYNQ_QSPI
 
 #elif defined(CONFIG_ZC770_XM011)
 # define CONFIG_ZYNQ_SERIAL_UART1
@@ -41,7 +41,7 @@
 # define CONFIG_ZYNQ_SERIAL_UART0
 # define CONFIG_ZYNQ_GEM1
 # define CONFIG_ZYNQ_GEM_PHY_ADDR1     7
-# define CONFIG_ZYNQ_SPI
+# define CONFIG_ZYNQ_QSPI
 
 #else
 # define CONFIG_ZYNQ_SERIAL_UART0

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 506b0ab0250d76f95cda9434bc34ecbc0d5addbb..c0b7922c2d8f7cb7438c1d06b5b087c843d2e16a 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -27,7 +27,7 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_ZYNQ_SPI
+#define CONFIG_ZYNQ_QSPI
 
 #include <configs/zynq_common.h>