From 470a22c7bdad4865d200df0eca118e316b405f37 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 25 Feb 2015 13:56:13 +0100 Subject: [PATCH] qspi: Move zynqmp QSPI driver to separate file This driver comes from zynq_qspi.c driver but this zynqmp_qspi.c driver will be replaced by different one that's why this patch is just preparation for easier merge. Signed-off-by: Michal Simek --- drivers/spi/Makefile | 2 +- drivers/spi/{zynq_qspi.c => zynqmp_qspi.c} | 0 include/configs/xilinx_zynqmp.h | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename drivers/spi/{zynq_qspi.c => zynqmp_qspi.c} (100%) diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 3ec6d17488c..fcdaf279597 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_ZYNQ_QSPI) += zynq_qspi.o +obj-$(CONFIG_ZYNQMP_QSPI) += zynqmp_qspi.o obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynqmp_qspi.c similarity index 100% rename from drivers/spi/zynq_qspi.c rename to drivers/spi/zynqmp_qspi.c diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 8434a7db446..e46b3bccf7b 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_ZYNQ_QSPI +#define CONFIG_ZYNQMP_QSPI #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_CONS_INDEX 0 @@ -85,7 +85,7 @@ #define CONFIG_BOOTP_SERVERIP -#ifdef CONFIG_ZYNQ_QSPI +#ifdef CONFIG_ZYNQMP_QSPI # define CONFIG_SF_DEFAULT_SPEED 30000000 # define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_BAR -- 2.47.3