From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ob0-x22c.google.com ([2607:f8b0:4003:c01::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZB8w-00044k-Q9 for linux-mtd@lists.infradead.org; Thu, 24 Oct 2013 02:59:27 +0000 Received: by mail-ob0-f172.google.com with SMTP id gq1so1737301obb.17 for ; Wed, 23 Oct 2013 19:59:05 -0700 (PDT) From: Brian Norris To: Subject: [PATCH 4/5] mtd: m25p80: remove M25PXX_USE_FAST_READ Kconfig Date: Wed, 23 Oct 2013 19:58:22 -0700 Message-Id: <1382583503-13748-4-git-send-email-computersforpeace@gmail.com> In-Reply-To: <1382583503-13748-1-git-send-email-computersforpeace@gmail.com> References: <1382583503-13748-1-git-send-email-computersforpeace@gmail.com> Cc: Marek Vasut , sourav.poddar@ti.com, Brian Norris , Artem Bityutskiy List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Remove the compile-time option for FAST_READ, since we have run-time support for detecting it. Signed-off-by: Brian Norris --- drivers/mtd/devices/Kconfig | 7 ------- drivers/mtd/devices/m25p80.c | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index 74ab4b7..0128138 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig @@ -95,13 +95,6 @@ config MTD_M25P80 if you want to specify device partitioning or to use a device which doesn't support the JEDEC ID instruction. -config M25PXX_USE_FAST_READ - bool "Use FAST_READ OPCode allowing SPI CLK >= 50MHz" - depends on MTD_M25P80 - default y - help - This option enables FAST_READ access supported by ST M25Pxx. - config MTD_SPEAR_SMI tristate "SPEAR MTD NOR Support through SMI controller" depends on PLAT_SPEAR diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 7e3ec7a..d6c5c57 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -1055,13 +1055,14 @@ static int m25p_probe(struct spi_device *spi) flash->page_size = info->page_size; flash->mtd.writebufsize = flash->page_size; - flash->fast_read = false; - if (np && of_property_read_bool(np, "m25p,fast-read")) + if (np) + /* If we were instantiated by DT, use it */ + flash->fast_read = of_property_read_bool(np, "m25p,fast-read"); + else + /* If we weren't instantiated by DT, default to fast-read */ flash->fast_read = true; -#ifdef CONFIG_M25PXX_USE_FAST_READ - flash->fast_read = true; -#endif + /* Some devices cannot do fast-read, no matter what DT tells us */ if (info->flags & M25P_NO_FR) flash->fast_read = false; -- 1.8.4