commit 78ee1c5eb3bbef354c4b140e43057469f799ec29
author John Newlin <jnewlin@google.com> Mon Feb 09 12:40:24 2015 -0800
committer Ed James <edjames@google.com> Fri Feb 13 13:45:04 2015 -0800
tree d4fabcc3fe34221041d257bd92376e425f7e477d
parent 70abd4128327c12471cb11255677b81834714bdb

Copy over fix for Spansion flash:

Original message:
  Author: Ed James <edjames@google.com>
  Date:   Mon Sep 22 13:07:53 2014 -0700

    bruno kernel: Spansion S25FL132K support

Change-Id: Ia84f32713372e7c9d9e9ae849268113bf3fece5d

drivers/mtd/spi-nor/spi-nor.c

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index b07449c..8fa71d6 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -589,6 +589,7 @@
 	{ "s25fl128s",	INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_QUAD_READ) },
 	{ "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, 0) },
 	{ "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, 0) },
+	{ "s25fl132k",	INFO(0x014016,	    0,	64 * 1024,  64, SECT_4K) },
 	{ "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
 	{ "s25sl008a",  INFO(0x010213,      0,  64 * 1024,  16, 0) },
 	{ "s25sl016a",  INFO(0x010214,      0,  64 * 1024,  32, 0) },