From patchwork Mon Dec 15 11:59:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 42248 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A201821772 for ; Mon, 15 Dec 2014 12:00:31 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf7428279eek.1 for ; Mon, 15 Dec 2014 04:00:30 -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=63ZIVQAXycWCvpraQNjPMCcC7lpN+r85+MxNP8XOv+I=; b=bVT9fS1c0pCfuxoe+cqorcQ1xYSdkJToNFTb07hXKithznzBHkD67sSETrpO/Prbqh 93PzEg+dlZNl/G2Ews/TGxr9/GFfOUYT2rc6qiQy4/K0kZi0yz5Hg2UNI0wIJ2lkBNTG D7QPpO6KnmVz+znAtO7ajOrLytOYnIT7z29QNrJvwdHEXHD1GaIsyOQL5EfPIcUREdQQ xn8+7tJQc6/ZstL9wYxJUT/F3JHdE90aYrZLwNmDvizHVG1rdqhfIfBRt1UciMEV4Caf s7yOCxLKZ2a0S6XRzGEfbsgmgBoEd68NkpH3IZGEmKEpKB57Nbpampzw7/tqP+MqosSk 1hWw== X-Gm-Message-State: ALoCoQnPbzfhoi2d9MZUTu1o0GwcanX+3VVwoVdu6W+lRh8tb1pG2j/ofTyFMMsua+ODVI2lhfwi X-Received: by 10.194.95.74 with SMTP id di10mr4693287wjb.0.1418644830844; Mon, 15 Dec 2014 04:00:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.227 with SMTP id ap3ls719246lac.60.gmail; Mon, 15 Dec 2014 04:00:30 -0800 (PST) X-Received: by 10.152.238.1 with SMTP id vg1mr30188257lac.83.1418644830493; Mon, 15 Dec 2014 04:00:30 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id ms6si10229009lbb.52.2014.12.15.04.00.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 04:00:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gf13so9048879lab.7 for ; Mon, 15 Dec 2014 04:00:30 -0800 (PST) X-Received: by 10.152.26.201 with SMTP id n9mr23399218lag.50.1418644830035; Mon, 15 Dec 2014 04:00:30 -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.142.69 with SMTP id ru5csp691976lbb; Mon, 15 Dec 2014 04:00:28 -0800 (PST) X-Received: by 10.70.52.98 with SMTP id s2mr49716781pdo.5.1418644825230; Mon, 15 Dec 2014 04:00:25 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ey6si13572370pab.160.2014.12.15.04.00.24 for ; Mon, 15 Dec 2014 04:00:25 -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 S1751526AbaLOL7z (ORCPT + 27 others); Mon, 15 Dec 2014 06:59:55 -0500 Received: from mail-yk0-f174.google.com ([209.85.160.174]:49191 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbaLOL7t (ORCPT ); Mon, 15 Dec 2014 06:59:49 -0500 Received: by mail-yk0-f174.google.com with SMTP id 10so4850519ykt.19 for ; Mon, 15 Dec 2014 03:59:48 -0800 (PST) X-Received: by 10.170.72.7 with SMTP id o7mr24234662yko.73.1418644788725; Mon, 15 Dec 2014 03:59:48 -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 d91sm5783468yhq.53.2014.12.15.03.59.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Dec 2014 03:59:48 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, computersforpeace@gmail.com, linux-mtd@lists.infradead.org Cc: lee.jones@linaro.org, kernel@stlinux.com, Angus Clark , Carmelo Amoroso Subject: [PATCH v3 09/13] mtd: st_spi_fsm: Update Spansion device entries Date: Mon, 15 Dec 2014 11:59:16 +0000 Message-Id: <1418644760-18773-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418644760-18773-1-git-send-email-lee.jones@linaro.org> References: <1418644760-18773-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.215.48 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 949745a..7c024ec 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c @@ -483,6 +483,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 | \ @@ -493,6 +494,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, @@ -506,17 +513,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 | \