From a5414edd2fa196b59183a1dab35d1fd468868b40 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Sat, 28 Feb 2015 12:45:01 +0530 Subject: [PATCH] zynqmp: qspi: Renamed zynqmp_qspi to zynqmp_legacy_qspi Renamed zynqmp_qspi to zynqmp_legacy_qspi so that the qspi functionality didnt break with any of the zynqmp generic qspi patch series. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- drivers/spi/Makefile | 2 +- drivers/spi/{zynqmp_qspi.c => zynqmp_legacy_qspi.c} | 0 include/configs/xilinx_zynqmp.h | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename drivers/spi/{zynqmp_qspi.c => zynqmp_legacy_qspi.c} (100%) diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index fcdaf279597..689e2d36c74 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -48,5 +48,5 @@ obj-$(CONFIG_TEGRA114_SPI) += tegra114_spi.o obj-$(CONFIG_TI_QSPI) += ti_qspi.o obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o obj-$(CONFIG_ZYNQ_SPI) += zynq_spi.o -obj-$(CONFIG_ZYNQMP_QSPI) += zynqmp_qspi.o +obj-$(CONFIG_ZYNQMP_LEGACY_QSPI) += zynqmp_legacy_qspi.o obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o diff --git a/drivers/spi/zynqmp_qspi.c b/drivers/spi/zynqmp_legacy_qspi.c similarity index 100% rename from drivers/spi/zynqmp_qspi.c rename to drivers/spi/zynqmp_legacy_qspi.c diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e46b3bccf7b..03fa6be9f7e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -58,7 +58,7 @@ #define CONFIG_ZYNQ_SERIAL_UART0 #define CONFIG_ZYNQ_SERIAL -#define CONFIG_ZYNQMP_QSPI +#define CONFIG_ZYNQMP_LEGACY_QSPI #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_CONS_INDEX 0 @@ -85,7 +85,7 @@ #define CONFIG_BOOTP_SERVERIP -#ifdef CONFIG_ZYNQMP_QSPI +#ifdef CONFIG_ZYNQMP_LEGACY_QSPI # define CONFIG_SF_DEFAULT_SPEED 30000000 # define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_BAR -- 2.47.3