Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mach-aspeed/flash.c: Add support for Spansion S25FL256L #28

Open
wants to merge 1 commit into
base: v2016.07-aspeed-openbmc
Choose a base branch
from
Open

mach-aspeed/flash.c: Add support for Spansion S25FL256L #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion arch/arm/mach-aspeed/flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* FLASH chips info */
#define S25FL064A 0x160201
#define S25FL128P 0x182001
#define S25FL256S 0x190201
#define S25FL256L 0x196001
#define W25X16 0x1530ef
#define W25X64 0x1730ef
#define W25Q64BV 0x1740ef
Expand Down Expand Up @@ -975,6 +976,19 @@ static ulong flash_get_size (ulong base, flash_info_t *info)
info->address32 = 1;
#endif
break;
case S25FL256L:
info->sector_count = 512;
info->size = 0x2000000;
info->address32 = 1;
erase_region_size = 0x10000;
info->readcmd = 0x0b;
info->dualport = 0;
info->dummybyte = 1;
info->buffersize = 256;
WriteClk = 50;
EraseClk = 20;
ReadClk = 50;
break;

case MX25L25635E:
info->sector_count = 256;
Expand Down Expand Up @@ -1348,7 +1362,7 @@ static ulong flash_get_size (ulong base, flash_info_t *info)
*((volatile ulong*) (info->reg_base + 0x4)) = reg;

/* set flash chips to 32bits addressing mode */
if ((info->flash_id & 0xFF) == 0x01) /* Spansion */
if ((info->flash_id & 0xFF) == 0x01 && (info->flash_id != S25FL256L)) /* Spansion */
enable4b_spansion(info);
else if ((info->flash_id & 0xFF) == 0x20) /* Numonyx */
enable4b_numonyx(info);
Expand Down