From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755781AbcAHQE6 (ORCPT ); Fri, 8 Jan 2016 11:04:58 -0500 Received: from eusmtp01.atmel.com ([212.144.249.243]:18146 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755757AbcAHQE5 (ORCPT ); Fri, 8 Jan 2016 11:04:57 -0500 From: Cyrille Pitchen To: , CC: , , , , , , , , , , , , Cyrille Pitchen Subject: [PATCH linux-next v2 07/14] mtd: spi-nor: fix support of Spansion memories Date: Fri, 8 Jan 2016 17:02:19 +0100 Message-ID: X-Mailer: git-send-email 1.8.2.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch is only a transitional one. It concludes the series of patches to select op codes and protocols by manufacturer. Signed-off-by: Cyrille Pitchen --- drivers/mtd/spi-nor/spi-nor.c | 53 ++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index db76af852198..067425c7a0ff 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1466,10 +1466,35 @@ static int micron_set_single_mode(struct spi_nor *nor) return 0; } -static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info) +static int spansion_set_quad_mode(struct spi_nor *nor) { int status; + status = spansion_quad_enable(nor); + if (status) { + dev_err(nor->dev, "Spansion quad-read not enabled\n"); + return -EINVAL; + } + nor->read_proto = SNOR_PROTO_1_1_4; + nor->read_opcode = SPINOR_OP_READ_1_1_4; + return 0; +} + +static int spansion_set_dual_mode(struct spi_nor *nor) +{ + nor->read_proto = SNOR_PROTO_1_1_2; + nor->read_opcode = SPINOR_OP_READ_1_1_2; + return 0; +} + +static int spansion_set_single_mode(struct spi_nor *nor) +{ + nor->read_proto = SNOR_PROTO_1_1_1; + return 0; +} + +static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info) +{ switch (JEDEC_MFR(info)) { case SNOR_MFR_MACRONIX: return macronix_set_quad_mode(nor); @@ -1481,20 +1506,13 @@ static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info) return micron_set_quad_mode(nor); case SNOR_MFR_SPANSION: - status = spansion_quad_enable(nor); - if (status) { - dev_err(nor->dev, "Spansion quad-read not enabled\n"); - return -EINVAL; - } - nor->read_proto = SNOR_PROTO_1_1_4; - break; + return spansion_set_quad_mode(nor); default: - return -EINVAL; + break; } - nor->read_opcode = SPINOR_OP_READ_1_1_4; - return 0; + return -EINVAL; } static int set_dual_mode(struct spi_nor *nor, const struct flash_info *info) @@ -1509,13 +1527,14 @@ static int set_dual_mode(struct spi_nor *nor, const struct flash_info *info) case SNOR_MFR_MICRON: return micron_set_dual_mode(nor); + case SNOR_MFR_SPANSION: + return spansion_set_dual_mode(nor); + default: - nor->read_proto = SNOR_PROTO_1_1_2; break; } - nor->read_opcode = SPINOR_OP_READ_1_1_2; - return 0; + return -EINVAL; } static int set_single_mode(struct spi_nor *nor, const struct flash_info *info) @@ -1530,12 +1549,14 @@ static int set_single_mode(struct spi_nor *nor, const struct flash_info *info) case SNOR_MFR_MICRON: return micron_set_single_mode(nor); + case SNOR_MFR_SPANSION: + return spansion_set_single_mode(nor); + default: - nor->read_proto = SNOR_PROTO_1_1_1; break; } - return 0; + return -EINVAL; } static int spi_nor_check(struct spi_nor *nor) -- 1.8.2.2