From: Tom Rini <trini@ti.com>
Date: Thu, 13 Jun 2013 19:18:35 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-spi
X-Git-Tag: v2013.07-rc1~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0df254663d44f7fd4b714542bb4602626837465;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-spi
---

f0df254663d44f7fd4b714542bb4602626837465
diff --combined drivers/mtd/spi/spansion.c
index dad30b5,2218e2f..b3ef90f
--- a/drivers/mtd/spi/spansion.c
+++ b/drivers/mtd/spi/spansion.c
@@@ -90,18 -90,25 +90,25 @@@ static const struct spansion_spi_flash_
  		.name = "S25FL032P",
  	},
  	{
+ 		.idcode1 = 0x0216,
+ 		.idcode2 = 0x4d00,
+ 		.pages_per_sector = 256,
+ 		.nr_sectors = 128,
+ 		.name = "S25FL064P",
+ 	},
+ 	{
  		.idcode1 = 0x2018,
  		.idcode2 = 0x4d01,
  		.pages_per_sector = 256,
  		.nr_sectors = 256,
 -		.name = "S25FL129P_64K",
 +		.name = "S25FL129P_64K/S25FL128S",
  	},
  	{
  		.idcode1 = 0x0219,
  		.idcode2 = 0x4d01,
  		.pages_per_sector = 256,
  		.nr_sectors = 512,
- 		.name = "S25FL256S",
+ 		.name = "S25FL256S_64K",
  	},
  };