From: Michal Simek Date: Thu, 4 Feb 2016 07:34:24 +0000 (+0100) Subject: spi: zynqmp: Load qspi based address from DT X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=092195d1f590b77cd5c06787c314894eab877e93;p=thirdparty%2Fu-boot.git spi: zynqmp: Load qspi based address from DT Read information from DT instead of hardcoded it. 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 a6eb8129aea..e223988b7d9 100644 --- a/arch/arm/include/asm/arch-zynqmp/hardware.h +++ b/arch/arm/include/asm/arch-zynqmp/hardware.h @@ -16,8 +16,6 @@ #define ZYNQ_SPI_BASEADDR0 0xFF040000 #define ZYNQ_SPI_BASEADDR1 0xFF050000 -#define ZYNQMP_QSPI_BASEADDR 0xFF0F0000 - #define ZYNQ_I2C_BASEADDR0 0xFF020000 #define ZYNQ_I2C_BASEADDR1 0xFF030000 diff --git a/drivers/spi/zynqmp_qspi.c b/drivers/spi/zynqmp_qspi.c index fd842a88723..c4810346b34 100644 --- a/drivers/spi/zynqmp_qspi.c +++ b/drivers/spi/zynqmp_qspi.c @@ -162,9 +162,11 @@ static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus) struct zynqmp_qspi_platdata *plat = bus->platdata; debug("%s\n", __func__); - plat->regs = (struct zynqmp_qspi_regs *)(ZYNQMP_QSPI_BASEADDR + 0x100); - plat->dma_regs = (struct zynqmp_qspi_dma_regs *)(ZYNQMP_QSPI_BASEADDR + + + plat->regs = (struct zynqmp_qspi_regs *)(dev_get_addr(bus) + 0x100); + plat->dma_regs = (struct zynqmp_qspi_dma_regs *)(dev_get_addr(bus) + 0x800); + plat->frequency = 166666666; plat->speed_hz = plat->frequency / 2;