From f170eeba7c7d914581acb39e76fb14a558579d57 Mon Sep 17 00:00:00 2001 From: Michel Stempin Date: Sun, 6 Jan 2013 00:39:36 +0100 Subject: [PATCH] --- yaml --- r: 360350 b: refs/heads/master c: 55bf75b7dd8ec875d048824f3cdecf8254e292e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d1a7d010cfc0..3da2ff39280c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62116e5171e00f85a8d53f76e45b84423c89ff34 +refs/heads/master: 55bf75b7dd8ec875d048824f3cdecf8254e292e5 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 069e34f909ed..5b6b0728be21 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -732,6 +732,10 @@ static const struct spi_device_id m25p_ids[] = { /* Everspin */ { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) }, + /* GigaDevice */ + { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) }, + { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) }, + /* Intel/Numonyx -- xxxs33b */ { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) },