From patchwork Fri May 22 17:09:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bacem.daassi@gmail.com X-Patchwork-Id: 1296604 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HdZodprp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49TTBs11WKz9sRf for ; Sat, 23 May 2020 13:20:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 653F4813C3; Sat, 23 May 2020 05:20:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HdZodprp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 065488160C; Fri, 22 May 2020 19:11:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1608E8160C for ; Fri, 22 May 2020 19:11:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bacem.daassi@gmail.com Received: by mail-ed1-x542.google.com with SMTP id d24so9755815eds.11 for ; Fri, 22 May 2020 10:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=+mJKOMCQo4X26GO/r2SfPgyZ+v4SwIeg4hKUuJmpl/U=; b=HdZodprpEjrEZVgH8+uENnZ52Rp5MsLrzcjmHEWnx8fEmRbNvc/20lKZR8ZIapKtts VzbHi+NvfB0kDZI8KPgl3oIHB5YeJdEJG+GSZ5eNfPqeSk3ymfOD1SHqHdN/Bgc4SwFU FysOXzRUA8Bm3HfX0lt20pmz7fpdBHrPoMjjsVOvBux+TYVh1OoBrY5wcoGZNGGNR5og Snp3xYbcQWbIfyfXizYyhx7y7gUv5JO7ZyHczUEwQh1Dc0HEoBwGirTcBnDxihkM28Gd i0QEjJqExfc3WBgpUC7lutYThs9eutEs+BHjaHUiVrBj8upwbDuPk8pL4vl5TcsX+LfZ F83w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+mJKOMCQo4X26GO/r2SfPgyZ+v4SwIeg4hKUuJmpl/U=; b=Wq/nisGByZPLgaaFX0TNdjbaqAr9dSRZ5XEBsbVzRHf69IENYua2xJV6nW+TFEvq1H mywoXeVkjfM3iRcgf6uiODWtmViv+XKjniGlz/JMPj/vUgOX6ANdDwumQRpVqiyxgLB5 igbn3VdTgmesZgBIZztiuu0yYtfFY3WSkivoCaet1Lmm26g+cJSGWPfLkz5sA/w6B4xf bnorI8BxuHZB3T2vv1gA06XF7LGHhaO0lplJlSY0dflT1PLmjhjKXxJRBpnIvMqrDhHz lurMC6eaPYe8WALtFj0kUl5garG4rs0Z5Y8B49UEqbl4Q2IPRKxlz66KpjyoR2VlDJ6W oS1g== X-Gm-Message-State: AOAM530dCEgkQehzzZ3ymNy9gPBo5F+weT4JaUQ/aK/yJg0ikwper+30 hv9Y++nPADcXgpeVWaGar87nBKuOeURg7A== X-Google-Smtp-Source: ABdhPJzDeMiqQa42mQdS/HpyIJW9jBTt0lHr/zs07dxgcWG/mwUlRhtLt6/eCQ/GItxsgb9SQjnC1Q== X-Received: by 2002:a50:b701:: with SMTP id g1mr3919781ede.259.1590167480424; Fri, 22 May 2020 10:11:20 -0700 (PDT) Received: from MUCL0060.Speedport_W_724V_Typ_A_05011603_06_003 (pd954e8f1.dip0.t-ipconnect.de. [217.84.232.241]) by smtp.gmail.com with ESMTPSA id q16sm8176091eju.73.2020.05.22.10.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 10:11:19 -0700 (PDT) From: bacem.daassi@gmail.com X-Google-Original-From: Bacem.Daassi@cypress.com To: u-boot@lists.denx.de Cc: jagan@amarulasolutions.com, vigneshr@ti.com, bacem.daassi@cypress.com, bacem.daassi@gmail.com, takahiro.kuwano@cypress.com, Bacem Daassi Subject: [PATCH] Clean up the Spansion/Cypress/Infineon device ID table Date: Fri, 22 May 2020 19:09:53 +0200 Message-Id: <20200522170953.4818-1-Bacem.Daassi@cypress.com> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Sat, 23 May 2020 05:20:19 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Bacem Daassi Signed-off-by: Bacem Daassi Clean up the Spansion/Cypress/Infineon device ID table. Remove s25fl512s_256k since it's a duplicate of s25fl512s. Remove s25fl512s_64k and s25fl512s_512k since these devices do not exist. Rename s25fl128s to s25fl128s1. Add the new device s25fl128s0. Add device s25fl256l to the device ID table. All devices were tested on real silicon and confirmed to be working. Signed-off-by: Bacem Daassi Signed-off-by: Bacem Daassi --- drivers/mtd/spi/spi-nor-ids.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index e5e7102923..5f6bbde53e 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -197,12 +197,10 @@ const struct flash_info spi_nor_ids[] = { { INFO("s25fl256s1", 0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { INFO6("s25fl512s", 0x010220, 0x4d0080, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { INFO6("s25fs512s", 0x010220, 0x4d0081, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { INFO("s25fl512s_256k", 0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { INFO("s25fl512s_64k", 0x010220, 0x4d01, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { INFO("s25fl512s_512k", 0x010220, 0x4f00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { INFO("s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, 0) }, { INFO("s25sl12801", 0x012018, 0x0301, 64 * 1024, 256, 0) }, - { INFO6("s25fl128s", 0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, + { INFO6("s25fl128s0", 0x012018, 0x4d0080, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, + { INFO6("s25fl128s1", 0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { INFO("s25fl129p0", 0x012018, 0x4d00, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { INFO("s25fl129p1", 0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { INFO("s25sl008a", 0x010213, 0, 64 * 1024, 16, 0) }, @@ -214,6 +212,7 @@ const struct flash_info spi_nor_ids[] = { { INFO("s25fl208k", 0x014014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ) }, { INFO("s25fl064l", 0x016017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, { INFO("s25fl128l", 0x016018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + { INFO("s25fl256l", 0x016019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, #endif #ifdef CONFIG_SPI_FLASH_SST /* SST */ /* SST -- large erase sizes are "overlays", "sectors" are 4K */