From 2f5c5b676ddd1db13d2b850e39b6fbfb000f907e Mon Sep 17 00:00:00 2001 From: BernardXiong Date: Wed, 13 May 2015 21:28:02 +0800 Subject: [PATCH] [DeviceDrivers] Add GD25Q flash id in w25qxx.c --- components/drivers/spi/spi_flash_w25qxx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/drivers/spi/spi_flash_w25qxx.c b/components/drivers/spi/spi_flash_w25qxx.c index bdcdbd83c..6e002c38c 100644 --- a/components/drivers/spi/spi_flash_w25qxx.c +++ b/components/drivers/spi/spi_flash_w25qxx.c @@ -13,6 +13,7 @@ * 2012-05-06 aozima can page write. * 2012-08-23 aozima add flash lock. * 2012-08-24 aozima fixed write status register BUG. + * 2015-05-13 bernard add GD25Q flash ID. */ #include @@ -28,8 +29,10 @@ #define PAGE_SIZE 4096 -/* JEDEC Manufacturer¡¯s ID */ +/* JEDEC Manufacturer��s ID */ #define MF_ID (0xEF) +#define GD_ID (0xC8) + /* JEDEC Device ID: Memory type and Capacity */ #define MTC_W25Q16_BV_CL_CV (0x4015) /* W25Q16BV W25Q16CL W25Q16CV */ #define MTC_W25Q16_DW (0x6015) /* W25Q16DW */ @@ -297,7 +300,7 @@ rt_err_t w25qxx_init(const char * flash_device_name, const char * spi_device_nam flash_unlock(&spi_flash_device); - if(id_recv[0] != MF_ID) + if(id_recv[0] != MF_ID && id_recv[0] != GD_ID) { FLASH_TRACE("Manufacturers ID error!\r\n"); FLASH_TRACE("JEDEC Read-ID Data : %02X %02X %02X\r\n", id_recv[0], id_recv[1], id_recv[2]); -- GitLab