Skip to content

driver: spiflash: add ISSI IS25 family support #187

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ else
BUILD_DATE := $(shell $(DATE) "$(DATE_FMT)")
endif
endif
export VERSION := v4.0.11-rc1
export VERSION := v4.0.11-rc2
REVISION :=
ifdef NIX_SHELL
SCMINFO := $(shell (host-utilities/setlocalversion))
Expand Down
31 changes: 29 additions & 2 deletions driver/spi_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#define MANUFACTURER_ID_ATMEL 0x1f
#define MANUFACTURER_ID_MICRON 0x20
#define MANUFACTURER_ID_WINBOND 0xef
#define MANUFACTURER_ID_ISSI 0x9d

/* Family Code */
#define DF_FAMILY_AT26F 0x00
Expand All @@ -33,6 +34,10 @@
#define DF_FAMILY_N25Q 0xA0
#define DF_FAMILY_M25P 0x20

#define DF_FAMILY_IS25LP 0x60
#define DF_FAMILY_IS25WP 0x70
#define DF_FAMILY_IS25LQ 0x40

/* AT45 Density Code */
#define DENSITY_AT45DB011D 0x0C
#define DENSITY_AT45DB021D 0x14
Expand Down Expand Up @@ -559,8 +564,8 @@ static int df_desc_init(struct dataflash_descriptor *df_desc, unsigned char vend
df_desc->family = family;

switch ( vendor ) {
case MANUFACTURER_ID_ATMEL: {

case MANUFACTURER_ID_ATMEL: {
if ((df_desc->family == DF_FAMILY_AT26F)
|| (df_desc->family == DF_FAMILY_AT26DF)) {
ret = df_at25_desc_init(df_desc);
Expand Down Expand Up @@ -594,6 +599,27 @@ static int df_desc_init(struct dataflash_descriptor *df_desc, unsigned char vend
}
break;

case MANUFACTURER_ID_ISSI:{

if (df_desc->family == DF_FAMILY_IS25LP) {
ret = df_n25q_desc_init(df_desc);
if (ret)
return ret;
} else if (df_desc->family == DF_FAMILY_IS25WP) {
ret = df_n25q_desc_init(df_desc);
if (ret)
return ret;
} else if (df_desc->family == DF_FAMILY_IS25LQ) {
ret = df_n25q_desc_init(df_desc);
if (ret)
return ret;
}else {
dbg_info("SF: Unsupported SerialFlash family %x\n", family);
return -1;
}
}
break;

default:
dbg_info("SF: Unsupported Manufactorer ID %x\n", vendor);
return -1;
Expand Down Expand Up @@ -625,7 +651,8 @@ static int dataflash_probe_atmel(struct dataflash_descriptor *df_desc)

if (dev_id[0] != MANUFACTURER_ID_ATMEL &&
dev_id[0] != MANUFACTURER_ID_WINBOND &&
dev_id[0] != MANUFACTURER_ID_MICRON) {
dev_id[0] != MANUFACTURER_ID_MICRON &&
dev_id[0] != MANUFACTURER_ID_ISSI) {
dbg_info("Not supported spi flash Manufactorer ID: %x\n",
dev_id[0]);
return -1;
Expand Down