From patchwork Thu May 22 11:24:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 30603 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7723420369 for ; Thu, 22 May 2014 11:24:33 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf10102219pdj.4 for ; Thu, 22 May 2014 04:24:32 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sL5m9pSr21YU/yvhyxTOkBeGTIKUpvJO8llC7mFVRb4=; b=HQjOfR3wx0GPnLer8Ksr+m5Qh4D92PjOguOO4v3CTf79f4xU69IKednknZE5UJQeDf jnD9ONADbV6Oj29PhBqvb2D7I0sHgAyUOdVl+rHedhOfHhpnHSmF7UdAwWMtqZB+coQ2 wd6Qz41NpEQJe0l8j9XWIbriXi7nmyXvaADDypEpRpyoAD5vaUhLwQ+blUVaCao/BrAk YzdQr5Xp6ed++/D3kAOqdSUXCYZnV1CscX39gJqtBGIOEDe0NgKIf4Ecfxgp/k3aANxp MUKPTzXeEf6YrDD32K4mOfkjAEClrkbI/cCi+V8L+zCQaY3O5MBWfea6BPJozBOYCkvq rdyQ== X-Gm-Message-State: ALoCoQkHt6Q5Qj14Izzz1Ik3I4CwptrYn+xUdKi7eh0/WOZpIbDRCcXZL5L9tN9cmVJtQDJkNWQX X-Received: by 10.66.66.109 with SMTP id e13mr24812013pat.1.1400757872809; Thu, 22 May 2014 04:24:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.33 with SMTP id q30ls1269891qgd.10.gmail; Thu, 22 May 2014 04:24:32 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr48273100vec.15.1400757872710; Thu, 22 May 2014 04:24:32 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id x1si2359998vem.40.2014.05.22.04.24.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 04:24:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ik5so848947vcb.3 for ; Thu, 22 May 2014 04:24:32 -0700 (PDT) X-Received: by 10.58.136.168 with SMTP id qb8mr20529794veb.21.1400757872636; Thu, 22 May 2014 04:24:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp189962vcb; Thu, 22 May 2014 04:24:32 -0700 (PDT) X-Received: by 10.42.52.199 with SMTP id k7mr54530305icg.4.1400757871911; Thu, 22 May 2014 04:24:31 -0700 (PDT) Received: from mail-ig0-f182.google.com (mail-ig0-f182.google.com [209.85.213.182]) by mx.google.com with ESMTPS id r5si5447668icc.94.2014.05.22.04.24.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 04:24:31 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.213.182 as permitted sender) client-ip=209.85.213.182; Received: by mail-ig0-f182.google.com with SMTP id uy17so3368195igb.3 for ; Thu, 22 May 2014 04:24:31 -0700 (PDT) X-Received: by 10.50.143.104 with SMTP id sd8mr21534811igb.18.1400757871688; Thu, 22 May 2014 04:24:31 -0700 (PDT) Received: from localhost.localdomain (host109-148-113-200.range109-148.btcentralplus.com. [109.148.113.200]) by mx.google.com with ESMTPSA id z4sm12643314igl.13.2014.05.22.04.24.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 04:24:31 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: computersforpeace@gmail.com, linux-mtd@lists.infradead.org, Angus Clark , Carmelo Amoroso , Lee Jones Subject: [PATCH 06/10] mtd: st_spi_fsm: Update Spansion device entries Date: Thu, 22 May 2014 12:24:04 +0100 Message-Id: <1400757848-18075-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400757848-18075-1-git-send-email-lee.jones@linaro.org> References: <1400757848-18075-1-git-send-email-lee.jones@linaro.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.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: 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 3409651..7514a07 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c @@ -445,6 +445,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 | \ @@ -455,6 +456,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, @@ -468,17 +475,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 | \