From patchwork Thu Dec 4 10:21:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 41922 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 971E225E8C for ; Thu, 4 Dec 2014 10:23:24 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id ge10sf7174981lab.8 for ; Thu, 04 Dec 2014 02:23:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=sv2zr5byI5mcIsKXdIAqjPsPsQmjbC6v1Ec1g1q64rQ=; b=WYKszsUwdQIBNxiURro9xch4Dg75dMihOQeQA4wX91/t0lNki1glMC8FhQI4qYLRiH ZxrjYPwW4nPmD5zXtpgMQ2Mpn4cQKbUTdlTsVAy+OQMbIipxNU6i3U18dpQe7FjiteL6 5J02GA4GxsjAH4K3HMEPqPLcnA95VNx4korNQlDw0e9DgkQgQTJrENqBeY7eE2PC7NJH 2QvtI9j8Mz+rDaPWS+YcgYOBn0Voso6E2KAVC2bT46yHMhpZ4L/q1B3J3TN+DowsbaMS 3DjwWuTcla/5nqKBWq/uxD72ITcdJ+/BiK0d22ohVpcuelHrmqHqboUwh+UVTuH+ymlU ZHXg== X-Gm-Message-State: ALoCoQlRYuXb1hvswuJIsZAOps8moNWwIR2gLpbj/dV+iy0BmwPI6Si0AZBfYo/g5RJklVqmmaX4 X-Received: by 10.180.94.3 with SMTP id cy3mr3113611wib.7.1417688603587; Thu, 04 Dec 2014 02:23:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.40 with SMTP id n8ls251149laj.73.gmail; Thu, 04 Dec 2014 02:23:23 -0800 (PST) X-Received: by 10.152.234.169 with SMTP id uf9mr8591173lac.86.1417688603144; Thu, 04 Dec 2014 02:23:23 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id z5si13825729lal.63.2014.12.04.02.23.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Dec 2014 02:23:23 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id w7so13755796lbi.19 for ; Thu, 04 Dec 2014 02:23:23 -0800 (PST) X-Received: by 10.112.138.137 with SMTP id qq9mr8587098lbb.80.1417688603016; Thu, 04 Dec 2014 02:23:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp10243lbc; Thu, 4 Dec 2014 02:23:22 -0800 (PST) X-Received: by 10.70.47.195 with SMTP id f3mr16977213pdn.156.1417688601366; Thu, 04 Dec 2014 02:23:21 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ks5si42528317pdb.42.2014.12.04.02.23.20 for ; Thu, 04 Dec 2014 02:23:21 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754332AbaLDKWa (ORCPT + 26 others); Thu, 4 Dec 2014 05:22:30 -0500 Received: from mail-yk0-f170.google.com ([209.85.160.170]:38938 "EHLO mail-yk0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753886AbaLDKWV (ORCPT ); Thu, 4 Dec 2014 05:22:21 -0500 Received: by mail-yk0-f170.google.com with SMTP id q200so7814129ykb.1 for ; Thu, 04 Dec 2014 02:22:20 -0800 (PST) X-Received: by 10.236.31.232 with SMTP id m68mr11193185yha.173.1417688540164; Thu, 04 Dec 2014 02:22:20 -0800 (PST) Received: from localhost.localdomain (host109-148-232-11.range109-148.btcentralplus.com. [109.148.232.11]) by mx.google.com with ESMTPSA id y67sm16089929yhc.11.2014.12.04.02.22.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Dec 2014 02:22:19 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, computersforpeace@gmail.com, linux-mtd@lists.infradead.org, Angus Clark , Carmelo Amoroso Subject: [PATCH v2 RESEND 07/11] mtd: st_spi_fsm: Update Spansion device entries Date: Thu, 4 Dec 2014 10:21:48 +0000 Message-Id: <1417688512-7644-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417688512-7644-1-git-send-email-lee.jones@linaro.org> References: <1417688512-7644-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Angus Clark This patch updates various Spansion device entries in the flash_types[] table: - Define full 6-byte READIDs for S25FL128Sx devices (and fix the 4th byte). This allows us to differentiate between S25FL129P and S25FL128S devices. - Add S25FL128Px device entries. Signed-off-by: Angus Clark Signed-off-by: Carmelo Amoroso Signed-off-by: Lee Jones --- drivers/mtd/devices/st_spi_fsm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c index 33dfb0e..0501a57 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c @@ -444,6 +444,7 @@ static struct flash_info flash_types[] = { /* * Spansion S25FLxxxP * - 256KiB and 64KiB sector variants (identified by ext. JEDEC) + * - S25FL128Px devices do not support DUAL or QUAD I/O */ #define S25FLXXXP_FLAG (FLASH_FLAG_READ_WRITE | \ FLASH_FLAG_READ_1_1_2 | \ @@ -454,6 +455,12 @@ static struct flash_info flash_types[] = { FLASH_FLAG_READ_FAST) RDID_INFO("s25fl032p", RDID({0x01, 0x02, 0x15, 0x4d, 0x00}), 5, 64 * 1024, 64, S25FLXXXP_FLAG, 80, stfsm_s25fl_config), + RDID_INFO("s25fl128p1", RDID({0x01, 0x20, 0x18, 0x03, 0x00}), 5, + 256 * 1024, 64, + (FLASH_FLAG_READ_WRITE | FLASH_FLAG_READ_FAST), 104, NULL), + RDID_INFO("s25fl128p0", RDID({0x01, 0x20, 0x18, 0x03, 0x01}), 5, + 64 * 1024, 256, + (FLASH_FLAG_READ_WRITE | FLASH_FLAG_READ_FAST), 104, NULL), RDID_INFO("s25fl129p0", RDID({0x01, 0x20, 0x18, 0x4d, 0x00}), 5, 256 * 1024, 64, S25FLXXXP_FLAG, 80, stfsm_s25fl_config), RDID_INFO("s25fl129p1", RDID({0x01, 0x20, 0x18, 0x4d, 0x01}), 5, @@ -467,17 +474,18 @@ static struct flash_info flash_types[] = { * so this information is captured in the board's flags. * - Supports 'DYB' sector protection. Depending on variant, sectors * may default to locked state on power-on. + * - S25FL127Sx handled as S25FL128Sx */ #define S25FLXXXS_FLAG (S25FLXXXP_FLAG | \ FLASH_FLAG_RESET | \ FLASH_FLAG_DYB_LOCKING) - RDID_INFO("s25fl128s0", RDID({0x01, 0x20, 0x18, 0x03, 0x00}), 5, + RDID_INFO("s25fl128s0", RDID({0x01, 0x20, 0x18, 0x4d, 0x00, 0x80}), 6, 256 * 1024, 64, S25FLXXXS_FLAG, 80, stfsm_s25fl_config), - RDID_INFO("s25fl128s1", RDID({0x01, 0x20, 0x18, 0x03, 0x01}), 5, + RDID_INFO("s25fl128s1", RDID({0x01, 0x20, 0x18, 0x4d, 0x01, 0x80}), 6, 64 * 1024, 256, S25FLXXXS_FLAG, 80, stfsm_s25fl_config), - RDID_INFO("s25fl256s0", RDID({0x01, 0x02, 0x19, 0x4d, 0x00}), 5, + RDID_INFO("s25fl256s0", RDID({0x01, 0x02, 0x19, 0x4d, 0x00, 0x80}), 6, 256 * 1024, 128, S25FLXXXS_FLAG, 80, stfsm_s25fl_config), - RDID_INFO("s25fl256s1", RDID({0x01, 0x02, 0x19, 0x4d, 0x01}), 5, + RDID_INFO("s25fl256s1", RDID({0x01, 0x02, 0x19, 0x4d, 0x01, 0x80}), 6, 64 * 1024, 512, S25FLXXXS_FLAG, 80, stfsm_s25fl_config), #define W25X_FLAG (FLASH_FLAG_READ_WRITE | \