Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

sf: Add CONFIG_SF_DUAL_FLASH

Browse source 
This config will use for defining greater than single flash support.
currently - DUAL_STACKED and DUAL_PARALLEL.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
This commit is contained in:
Jagannadha Sutradharudu Teki 2014-01-11 15:25:04 +05:30
parent 056fbc73d5
commit b902e07cea
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README
View file

@ -2756,6 +2756,12 @@ CBFS (Coreboot Filesystem) support
Define this option to use the Bank addr/Extended addr Define this option to use the Bank addr/Extended addr
support on SPI flashes which has size > 16Mbytes. support on SPI flashes which has size > 16Mbytes.
CONFIG_SF_DUAL_FLASH Dual flash memories
Define this option to use dual flash support where two flash
memories can be connected with a given cs line.
currently Xilinx Zynq qspi support these type of connections.
- SystemACE Support: - SystemACE Support:
CONFIG_SYSTEMACE CONFIG_SYSTEMACE

3
drivers/mtd/spi/sf.c
View file

@ -18,9 +18,10 @@ static int spi_flash_read_write(struct spi_slave *spi,
unsigned long flags = SPI_XFER_BEGIN; unsigned long flags = SPI_XFER_BEGIN;
int ret; int ret;
#ifdef CONFIG_SF_DUAL_FLASH
if (spi->flags & SPI_XFER_U_PAGE) if (spi->flags & SPI_XFER_U_PAGE)
flags |= SPI_XFER_U_PAGE; flags |= SPI_XFER_U_PAGE;
#endif
if (data_len == 0) if (data_len == 0)
flags |= SPI_XFER_END; flags |= SPI_XFER_END;

14
drivers/mtd/spi/sf_ops.c
View file

@ -131,6 +131,7 @@ static int spi_flash_bank(struct spi_flash *flash, u32 offset)
} }
#endif #endif
#ifdef CONFIG_SF_DUAL_FLASH
static void spi_flash_dual_flash(struct spi_flash *flash, u32 *addr) static void spi_flash_dual_flash(struct spi_flash *flash, u32 *addr)
{ {
switch (flash->dual_flash) { switch (flash->dual_flash) {
@ -150,6 +151,7 @@ static void spi_flash_dual_flash(struct spi_flash *flash, u32 *addr)
break; break;
} }
} }
#endif
int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
{ {
@ -167,9 +169,10 @@ int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
check_status = poll_bit; check_status = poll_bit;
} }
#ifdef CONFIG_SF_DUAL_FLASH
if (spi->flags & SPI_XFER_U_PAGE) if (spi->flags & SPI_XFER_U_PAGE)
flags |= SPI_XFER_U_PAGE; flags |= SPI_XFER_U_PAGE;
#endif
ret = spi_xfer(spi, 8, &cmd, NULL, flags); ret = spi_xfer(spi, 8, &cmd, NULL, flags);
if (ret) { if (ret) {
debug("SF: fail to read %s status register\n", debug("SF: fail to read %s status register\n",
@ -257,9 +260,10 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
while (len) { while (len) {
erase_addr = offset; erase_addr = offset;
#ifdef CONFIG_SF_DUAL_FLASH
if (flash->dual_flash > SF_SINGLE_FLASH) if (flash->dual_flash > SF_SINGLE_FLASH)
spi_flash_dual_flash(flash, &erase_addr); spi_flash_dual_flash(flash, &erase_addr);
#endif
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
ret = spi_flash_bank(flash, erase_addr); ret = spi_flash_bank(flash, erase_addr);
if (ret < 0) if (ret < 0)
@ -298,9 +302,10 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
for (actual = 0; actual < len; actual += chunk_len) { for (actual = 0; actual < len; actual += chunk_len) {
write_addr = offset; write_addr = offset;
#ifdef CONFIG_SF_DUAL_FLASH
if (flash->dual_flash > SF_SINGLE_FLASH) if (flash->dual_flash > SF_SINGLE_FLASH)
spi_flash_dual_flash(flash, &write_addr); spi_flash_dual_flash(flash, &write_addr);
#endif
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
ret = spi_flash_bank(flash, write_addr); ret = spi_flash_bank(flash, write_addr);
if (ret < 0) if (ret < 0)
@ -383,9 +388,10 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
while (len) { while (len) {
read_addr = offset; read_addr = offset;
#ifdef CONFIG_SF_DUAL_FLASH
if (flash->dual_flash > SF_SINGLE_FLASH) if (flash->dual_flash > SF_SINGLE_FLASH)
spi_flash_dual_flash(flash, &read_addr); spi_flash_dual_flash(flash, &read_addr);
#endif
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
bank_sel = spi_flash_bank(flash, read_addr); bank_sel = spi_flash_bank(flash, read_addr);
if (bank_sel < 0) if (bank_sel < 0)

2
drivers/mtd/spi/sf_probe.c
View file

@ -150,8 +150,10 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
flash->page_size = ((ext_jedec == 0x4d00) ? 512 : 256) << flash->shift; flash->page_size = ((ext_jedec == 0x4d00) ? 512 : 256) << flash->shift;
flash->sector_size = params->sector_size << flash->shift; flash->sector_size = params->sector_size << flash->shift;
flash->size = flash->sector_size * params->nr_sectors << flash->shift; flash->size = flash->sector_size * params->nr_sectors << flash->shift;
#ifdef CONFIG_SF_DUAL_FLASH
if (flash->dual_flash & SF_DUAL_STACKED_FLASH) if (flash->dual_flash & SF_DUAL_STACKED_FLASH)
flash->size <<= 1; flash->size <<= 1;
#endif
/* Compute erase sector and command */ /* Compute erase sector and command */
if (params->flags & SECT_4K) { if (params->flags & SECT_4K) {