d6c831e0e5
This flag was added to 4.9 with upstream commit 76a4707de5e18dc32d9cb4e990686140c5664a15. Signed-off-by: Victor Shyba <victor1984@riseup.net> [refresh and adjust platform patches, fix commit message] Signed-off-by: Mathias Kresin <dev@kresin.me>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 70516f60de441829e7813c0b26567c8bda39c011 Mon Sep 17 00:00:00 2001
|
|
From: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
|
|
Date: Sun, 24 Apr 2016 23:20:26 +0530
|
|
Subject: [PATCH 109/113] drivers: mtd: spi-nor: Enable QSPI Flash in Kernel
|
|
|
|
Enable read from QSPI flash, Write onto QSPI Flash and
|
|
erase QSPI Flash in Fast mode in Kernel.
|
|
|
|
Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
|
|
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -798,6 +798,7 @@ static const struct flash_info spi_nor_i
|
|
{ "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
{ "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
{ "s25fs256s1", INFO6(0x010219, 0x4d0181, 64 * 1024, 512, 0)},
|
|
+ { "s25fs512s", INFO6(0x010220, 0x4d0081, 128 * 1024, 512, 0)},
|
|
{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
|
|
{ "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
{ "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
@@ -964,9 +965,11 @@ static int spansion_s25fs_disable_4kb_er
|
|
ret = nor->read_reg(nor, SPINOR_OP_SPANSION_RDAR, &cr3v, 1);
|
|
if (ret)
|
|
return ret;
|
|
+/*
|
|
if (!(cr3v & CR3V_4KB_ERASE_UNABLE))
|
|
return -EPERM;
|
|
|
|
+*/
|
|
return 0;
|
|
}
|
|
|