From patchwork Wed Mar 26 16:39:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 27147 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBAA020369 for ; Wed, 26 Mar 2014 16:41:51 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id gq1sf8135326obb.11 for ; Wed, 26 Mar 2014 09:41:51 -0700 (PDT) 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=LoznZY3uJ4lBUq5PwS/37YLwvKzlGdGRDtNHhErUSYM=; b=UGLBQNg8rbAtqzMHrTnskCGfyjlXP62VWpn+bW7peUkxCs85vq7tro0bkfwaNF1fzH K7nz3Fq2fWAWKxehn5yVf1uvaSQJBrPDYahFZ+RjAilf4CHM5iq7TMB3OPZA5fylOBwm 5guRnqYHPsaYGxUSgTknGwecugjxTA5xg4qAk+FWGNBPcSye6I3FTr1GX7rlPPMXlFfn JQaVS8f9/QLFUWXRP/tJUrfbYONLWb/54r2uL8wsCXE/PidMymRPE+A8Zb2JB0tgzqhj mM2UEFOSyOT+ln5FJRLs7LrxaAKaTDPNIh8fZsZOA2SnYYeSvAdR53y4iSTqE2M11Xo7 foPg== X-Gm-Message-State: ALoCoQn5X3GjxKmhAFvXhVVFBegdtDIrjnLbI6yrTw5Xww6A8Pqfzx4GZV28kJ9IPkkCtoYx8gFk X-Received: by 10.182.236.74 with SMTP id us10mr18072783obc.36.1395852111429; Wed, 26 Mar 2014 09:41:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.110 with SMTP id 101ls713206qgq.88.gmail; Wed, 26 Mar 2014 09:41:51 -0700 (PDT) X-Received: by 10.52.118.212 with SMTP id ko20mr209803vdb.77.1395852111323; Wed, 26 Mar 2014 09:41:51 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id v2si4641779vet.196.2014.03.26.09.41.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 09:41:51 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so2694851vcb.4 for ; Wed, 26 Mar 2014 09:41:51 -0700 (PDT) X-Received: by 10.52.108.164 with SMTP id hl4mr11255390vdb.25.1395852111210; Wed, 26 Mar 2014 09:41:51 -0700 (PDT) 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.220.78.9 with SMTP id i9csp61233vck; Wed, 26 Mar 2014 09:41:50 -0700 (PDT) X-Received: by 10.68.138.165 with SMTP id qr5mr87835654pbb.123.1395852110231; Wed, 26 Mar 2014 09:41:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yf9si6534019pab.296.2014.03.26.09.41.49; Wed, 26 Mar 2014 09:41:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932144AbaCZQkT (ORCPT + 26 others); Wed, 26 Mar 2014 12:40:19 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:49130 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932129AbaCZQkP (ORCPT ); Wed, 26 Mar 2014 12:40:15 -0400 Received: by mail-we0-f170.google.com with SMTP id w61so1328329wes.1 for ; Wed, 26 Mar 2014 09:40:14 -0700 (PDT) X-Received: by 10.180.97.72 with SMTP id dy8mr30568881wib.5.1395852014309; Wed, 26 Mar 2014 09:40:14 -0700 (PDT) Received: from lee--X1.home (host109-148-113-193.range109-148.btcentralplus.com. [109.148.113.193]) by mx.google.com with ESMTPSA id gp10sm3913806wib.13.2014.03.26.09.40.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 09:40:13 -0700 (PDT) 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@st.com, Carmelo Amoroso Subject: [PATCH 12/15] mtd: st_spi_fsm: Update Spansion device entries Date: Wed, 26 Mar 2014 16:39:26 +0000 Message-Id: <1395851969-13520-13-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395851969-13520-1-git-send-email-lee.jones@linaro.org> References: <1395851969-13520-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=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 ced7dca..a223d8a 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c @@ -480,6 +480,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 | \ @@ -490,6 +491,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, @@ -503,17 +510,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 | \