From: Jagan Teki <jagannadh.teki@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 6/7] sf: Add CONFIG_SPI_FLASH_USE_4K_SECTORS in spi_flash
Date: Wed, 21 Sep 2016 02:36:47 +0530 [thread overview]
Message-ID: <1474405608-8126-7-git-send-email-jagannadh.teki@gmail.com> (raw)
In-Reply-To: <1474405608-8126-1-git-send-email-jagannadh.teki@gmail.com>
From: Jagan Teki <jteki@openedev.com>
Add CONFIG_SPI_FLASH_USE_4K_SECTORS in spi_flash code from header file.
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
drivers/mtd/spi/sf_internal.h | 4 ----
drivers/mtd/spi/spi_flash.c | 5 ++++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 9eb0b84..1301e48 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -22,11 +22,7 @@ enum spi_dual_flash {
/* sf param flags */
enum {
-#ifndef CONFIG_SPI_FLASH_USE_4K_SECTORS
- SECT_4K = 0,
-#else
SECT_4K = BIT(0),
-#endif
E_FSR = BIT(1),
SST_WR = BIT(2),
WR_QPP = BIT(3),
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 2b2a409..7f6e9ae 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1155,11 +1155,14 @@ int spi_flash_scan(struct spi_flash *flash)
flash->size <<= 1;
#endif
+#ifdef CONFIG_SPI_FLASH_USE_4K_SECTORS
/* Compute erase sector and command */
if (params->flags & SECT_4K) {
flash->erase_cmd = CMD_ERASE_4K;
flash->erase_size = 4096 << flash->shift;
- } else {
+ } else
+#endif
+ {
flash->erase_cmd = CMD_ERASE_64K;
flash->erase_size = flash->sector_size;
}
--
2.7.4
next prev parent reply other threads:[~2016-09-20 21:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 21:06 [U-Boot] [PATCH v4 0/7] spi/sf: Code removal/update Jagan Teki
2016-09-20 21:06 ` [U-Boot] [PATCH v4 1/7] sf: Simplify fastest read cmd code Jagan Teki
2016-09-20 21:06 ` [U-Boot] [PATCH v4 2/7] sf: Remove e_rd_cmd from param table Jagan Teki
2016-09-20 21:06 ` [U-Boot] [PATCH v4 3/7] spi: Use mode for rx mode flags Jagan Teki
2016-09-20 21:06 ` [U-Boot] [PATCH v4 4/7] spi: Remove SPI_RX_FAST Jagan Teki
2016-09-20 21:06 ` [U-Boot] [PATCH v4 5/7] sf: Remove SECT_32K Jagan Teki
2016-09-20 21:06 ` Jagan Teki [this message]
2016-09-20 21:06 ` [U-Boot] [PATCH v4 7/7] sf: Move flags macro's to spi_flash_params{} members Jagan Teki
2016-09-22 14:56 ` [U-Boot] [PATCH v4 0/7] spi/sf: Code removal/update Jagan Teki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474405608-8126-7-git-send-email-jagannadh.teki@gmail.com \
--to=jagannadh.teki@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.