From: Jagannadha Sutradharudu Teki Date: Fri, 3 May 2013 08:53:21 +0000 (+0530) Subject: spi: zynq: Use standard numbering for qspi connection topology X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a26a4f998f801645c4d675688bab70f2c42a794;p=thirdparty%2Fu-boot.git spi: zynq: Use standard numbering for qspi connection topology is_dual, as per hw gui. 0 - single 1 - dual stacked 2 - dual parallel Follow these number to in-sync with hardware gui flow. Signed-off-by: Jagannadha Sutradharudu Teki --- diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c index d9516859471..28ecda6936b 100644 --- a/drivers/mtd/spi/spansion.c +++ b/drivers/mtd/spi/spansion.c @@ -145,7 +145,7 @@ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode) flash->sector_size = 256 * params->pages_per_sector; /* address width is 4 for dual and 3 for single qspi */ - if (flash->spi->is_dual == 1) { + if (flash->spi->is_dual == 2) { flash->addr_width = 4; flash->size = flash->sector_size * (2 * params->nr_sectors); } else { diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 50b8fcbf825..cf4601b3bef 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -210,7 +210,7 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) flash->sector_size = 256 * params->pages_per_sector; /* address width is 4 for dual and 3 for single qspi */ - if (flash->spi->is_dual == 1) { + if (flash->spi->is_dual == 2) { flash->addr_width = 4; flash->size = flash->sector_size * (2 * params->nr_sectors); } else { diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c index c327612cc29..3b4be7f6985 100644 --- a/drivers/mtd/spi/winbond.c +++ b/drivers/mtd/spi/winbond.c @@ -112,7 +112,7 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) flash->sector_size = 4096; /* address width is 4 for dual and 3 for single qspi */ - if (flash->spi->is_dual == 1) { + if (flash->spi->is_dual == 2) { flash->addr_width = 4; flash->size = 4096 * 16 * (2 * params->nr_blocks); } else { diff --git a/drivers/spi/zynq_qspips.c b/drivers/spi/zynq_qspips.c index f46e06ff5d4..91aa7fcd094 100644 --- a/drivers/spi/zynq_qspips.c +++ b/drivers/spi/zynq_qspips.c @@ -90,8 +90,8 @@ enum xqspips_con_topology { MODE_UNKNOWN = -1, MODE_SINGLE, - MODE_DUAL_PARALLEL, MODE_DUAL_STACKED, + MODE_DUAL_PARALLEL, }; /* Definitions of the flash commands - Flash opcodes in ascending order */