diff options
| author | Tom Rini <trini@ti.com> | 2013-12-19 14:22:12 -0500 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-19 14:22:12 -0500 | 
| commit | 1bbba03d0e01ac466d063732afff3a5faadde2d3 (patch) | |
| tree | c03ba850505b4e01835c796616c6c67879a7fc61 /drivers/mtd/spi/sf_probe.c | |
| parent | ef184040b74ebba48edbc3ae7bf84b2753b8774c (diff) | |
| parent | ac5cce38de8f97a120b8c98f34be0d5eec50a6fb (diff) | |
| download | olio-uboot-2014.01-1bbba03d0e01ac466d063732afff3a5faadde2d3.tar.xz olio-uboot-2014.01-1bbba03d0e01ac466d063732afff3a5faadde2d3.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/mtd/spi/sf_probe.c')
| -rw-r--r-- | drivers/mtd/spi/sf_probe.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index c1eb75489..b863a9828 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -60,6 +60,7 @@ static const struct spi_flash_params spi_flash_params_table[] = {  	{"GD25LQ32",	   0xc86016, 0x0,	64 * 1024,    64,	       SECT_4K},  #endif  #ifdef CONFIG_SPI_FLASH_MACRONIX	/* MACRONIX */ +	{"MX25L2006E",	   0xc22012, 0x0,	64 * 1024,     4,	             0},  	{"MX25L4005",	   0xc22013, 0x0,	64 * 1024,     8,	             0},  	{"MX25L8005",	   0xc22014, 0x0,	64 * 1024,    16,	             0},  	{"MX25L1605D",	   0xc22015, 0x0,	64 * 1024,    32,	             0}, @@ -67,7 +68,7 @@ static const struct spi_flash_params spi_flash_params_table[] = {  	{"MX25L6405D",	   0xc22017, 0x0,	64 * 1024,   128,	             0},  	{"MX25L12805",	   0xc22018, 0x0,	64 * 1024,   256,	             0},  	{"MX25L25635F",	   0xc22019, 0x0,	64 * 1024,   512,	             0}, -	{"MX25L51235F",	   0xc2201A, 0x0,	64 * 1024,  1024,	             0}, +	{"MX25L51235F",	   0xc2201a, 0x0,	64 * 1024,  1024,	             0},  	{"MX25L12855E",	   0xc22618, 0x0,	64 * 1024,   256,	             0},  #endif  #ifdef CONFIG_SPI_FLASH_SPANSION	/* SPANSION */ |