Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[u-boot] / drivers / mtd / spi / spi_flash.c

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index d581cb3e89b0172458120ca54b237dca8c95f481..d1d81af0ec075c753e8129b117c3151a1b1ad312 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -133,6 +133,11 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
        case 0x1F:
                flash = spi_flash_probe_atmel(spi, idcode);
                break;
+#endif
+#ifdef CONFIG_SPI_FLASH_STMICRO
+       case 0x20:
+               flash = spi_flash_probe_stmicro(spi, idcode);
+               break;
 #endif
        default:
                debug("SF: Unsupported manufacturer %02X\n", idcode[0]);