Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / chips / jedec_probe.c

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index c443f527a53a5d9dae069701c9b1e0c497e63999..7c0b27d132b1bca8aa546cedac726cf5e92c6613 100644 (file)
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -120,7 +120,7 @@
 #define PM49FL008      0x006A
 
 /* Sharp */
-#define LH28F640BF     0x00b0
+#define LH28F640BF     0x00B0
 
 /* ST - www.st.com */
 #define M29F800AB      0x0058
@@ -1299,13 +1299,14 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = CFI_MFR_SHARP,
                .dev_id         = LH28F640BF,
                .name           = "LH28F640BF",
-               .devtypes       = CFI_DEVICETYPE_X8,
+               .devtypes       = CFI_DEVICETYPE_X16,
                .uaddr          = MTD_UADDR_UNNECESSARY,
-               .dev_size       = SIZE_4MiB,
-               .cmd_set        = P_ID_INTEL_STD,
-               .nr_regions     = 1,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 2,
                .regions        = {
-                       ERASEINFO(0x40000,16),
+                       ERASEINFO(0x10000, 127),
+                       ERASEINFO(0x02000, 8),
                }
        }, {
                .mfr_id         = CFI_MFR_SST,