From: Siva Durga Prasad Paladugu Date: Sat, 28 Feb 2015 07:15:04 +0000 (+0530) Subject: zynqmp: qspi: Switch from zynqmp legacy qspi to generic qspi X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2def0d36cfeef7ffe839901213c706ea44637b9d;p=thirdparty%2Fu-boot.git zynqmp: qspi: Switch from zynqmp legacy qspi to generic qspi Switch from zynqmp legacy qspi to generic qspi as the zynqmp has new qspi driver available. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h index e2a870420c8..8f4e7909d6c 100644 --- a/arch/arm/include/asm/arch-zynqmp/hardware.h +++ b/arch/arm/include/asm/arch-zynqmp/hardware.h @@ -16,7 +16,7 @@ #define ZYNQ_GEM_BASEADDR2 0xFF0D0000 #define ZYNQ_GEM_BASEADDR3 0xFF0E0000 -#define ZYNQ_QSPI_BASEADDR 0xFF0F0000 +#define ZYNQMP_QSPI_BASEADDR 0xFF0F0000 #define ZYNQ_SDHCI_BASEADDR0 0xFF160000 #define ZYNQ_SDHCI_BASEADDR1 0xFF170000 diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h index 44a30b9e56f..f5c90d11dc4 100644 --- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h +++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h @@ -14,6 +14,7 @@ static inline void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate) } int zynq_sdhci_init(unsigned long regbase); +int zynq_slcr_get_mio_pin_status(const char *periph); unsigned int zynqmp_get_silicon_version(void); diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 03fa6be9f7e..3aad29b5a28 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_LEGACY_QSPI +#define CONFIG_ZYNQMP_QSPI #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_CONS_INDEX 0 @@ -85,7 +85,8 @@ #define CONFIG_BOOTP_SERVERIP -#ifdef CONFIG_ZYNQMP_LEGACY_QSPI +#ifdef CONFIG_ZYNQMP_QSPI +# define CONFIG_SPI_GENERIC # define CONFIG_SF_DEFAULT_SPEED 30000000 # define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_BAR