From patchwork Mon Jun 27 10:19:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Krzeminski, Marcin (Nokia - PL/Wroclaw)" X-Patchwork-Id: 640924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rdQ4C5gxlz9t1M for ; Mon, 27 Jun 2016 20:22:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b=DUlOdZ34; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHTfL-0000xc-5H; Mon, 27 Jun 2016 10:21:19 +0000 Received: from mail-am1on0101.outbound.protection.outlook.com ([157.56.112.101] helo=emea01-am1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHTfD-0000lu-QY for linux-mtd@lists.infradead.org; Mon, 27 Jun 2016 10:21:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FCq0hwDhGpJ/f9gQtCJVZXUvBxEBfw4GJSsJMBEUwfU=; b=DUlOdZ34Q1lQ4rQYjpbdE0zYYcRuc/x1CCm5upgFFDYLxTFjy493kXDSZBvlLhG4Ya9wyHT5Ne2Myhkvr2fVMaqg6s7XYTIuVeFaQfmXOUevJZ/KAmkFcZwwrqsI55Ah/g9OZ4N3M/hMyv/Rzc+T1LqeVxaWkyc3dAc7R6t66CU= Received: from VI1PR07CA0100.eurprd07.prod.outlook.com (10.165.229.154) by HE1PR07MB1226.eurprd07.prod.outlook.com (10.164.51.28) with Microsoft SMTP Server (TLS) id 15.1.523.12; Mon, 27 Jun 2016 10:20:36 +0000 Received: from AM1FFO11FD019.protection.gbl (2a01:111:f400:7e00::143) by VI1PR07CA0100.outlook.office365.com (2a01:111:e400:7a52::26) with Microsoft SMTP Server (TLS) id 15.1.528.16 via Frontend Transport; Mon, 27 Jun 2016 10:20:36 +0000 Authentication-Results: spf=pass (sender IP is 131.228.2.241) smtp.mailfrom=nokia.com; lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.241 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.241; helo=fihe3nok0735.emea.nsn-net.net; Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.241) by AM1FFO11FD019.mail.protection.outlook.com (10.174.64.208) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Mon, 27 Jun 2016 10:20:35 +0000 Received: from fihe3nok0735.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id u5RAKSPn015153 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 27 Jun 2016 13:20:28 +0300 Received: from CNU418C7XK.nsn-intra.net ([10.154.155.220]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id u5RAKRIB015081 for ; Mon, 27 Jun 2016 13:20:28 +0300 X-HPESVCS-Source-Ip: 10.154.155.220 From: To: Subject: [RFC 3/3] mtd: spi-nor: Support for s25fs512s Date: Mon, 27 Jun 2016 12:19:39 +0200 Message-ID: <1467022779-17489-4-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467022779-17489-1-git-send-email-marcin.krzeminski@nokia.com> References: <1467022779-17489-1-git-send-email-marcin.krzeminski@nokia.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:131.228.2.241; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(2980300002)(438002)(189002)(199003)(16796002)(2906002)(77096005)(53416004)(11100500001)(86362001)(50226002)(5003940100001)(8936002)(356003)(586003)(81156014)(7846002)(81166006)(305945005)(6806005)(2950100001)(76176999)(86152002)(50986999)(2876002)(8676002)(450100001)(107886002)(189998001)(110136002)(68736007)(2351001)(87936001)(106466001)(33646002)(19580395003)(19580405001)(50466002)(97736004)(47776003)(36756003)(92566002)(229853001)(48376002)(138113003); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR07MB1226; H:fihe3nok0735.emea.nsn-net.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD019; 1:510d9np1qQMUQvTOzIP8P01Z4or1447iDViCUUClbJKbE8LiD2UCtQQeLozSXLIP1iUH6ZWZR6R2+YACrEok0YmhAdj+CsqF/hpNsUQGDacedbqUCEyfS9lPoISVlDnNQhWdxJdoywb981O/jIt06UF2uIEOzfgD0QVa4aa6A4WcucqE+nFwCcbRflqm3feKjFewVmqOcr9NlqA67Rr+jbMYvn8IAXKmE8hoteV+j6VW1DNWfMKS/FhfwhoafPYxjLAKPCH1hk+7MgUZ8+BjhTAzZ5dPVxq2T8+9Igo8+aev4nq6EHZxWIvQmwnAqpVdsQmegttSrOvR4oiKt33qGuKKnuvjYk+nQy5oLWJqO7ABkqZyGSj8gh5cWYtBebmk6+3Y6BCxdDBGP/O64DnL5ENrXxzi8k1U8dFT+M6yuAZ812iLop/CFlxPkpBYojygqRH6OVsJNANxLVG5TGz3ow== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f95fb58b-5abc-4cbe-0abd-08d39e74adf5 X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1226; 2:XaY9t53lEqSXUKxmhRuXM2QImo6H6nAupAbFxnNC3IbpS51xPhpL4+hG0EBqPQKJQpugmhbERZ77OqaDYNFV4KlzB+gTojUtdxhUsM+MxOH1vgqRefuw1cd4VWH4nFmrG7W7OPD9J6S7DNeYI+bIv+Pcsh+y27c3x5F1wgG9HSlh5iZpsiHr9vTfnSea+UKj; 3:XjHeVBdCwTe9bMHM4qcE0GVUk+OIqKbfZ1Rsh0GaE2uUy5EKeOIvm22jtP8VfOvYuddn1Dx/Om0jAoFzMn9IfKvq7VWsqUowQearo7NgMihGyQTeYklWSTkD0OTR9q/Qe7BLeDtUUZfXBxxzsw20/Mhfd+AbPbNdcUU3umZ/8A8Cw3EMrf/Cj54nSF/BdtNdaiU7UBoo6ETJhfJ1EBEWp8nSv5DoY24RHjYr/L6T86u7uduZA14YGhzXNQxN/CKfkx8XliZyT1XeTe2Y80YALg==; 25:d0SqzJoYVdCnZOks/TWzEQx4yh/En888OiT8NbRx2hUTW4FNCNfxv9WTFY+FVa4BlgHQCLXEY0+MGjsj0DyhdlPPIzE0Y4TLDjxFcXYrkYBz9H7xukZcExQwp1yic8HY1TV/53e6Z3aZ2Gp2vEk7S8fcdqjRBT8YJd9bhtyaIj6MWl9tzsOpcQ3Jk/xT4t7sCyO8CU6VQGnd8oyGgkfqkZlMXvTCOL8VrLnUu+sAyAYcpfXSsR9tyNSUeo2N84oyvkgQ/o35WZBQ6UlGU2caac8FkUXUFaUbOyoyyglLWB/szx0Lkn2UJAld7CV/tnWamseX3ySY6gr+nKlKN8xRqq8HNz3fHpe22c3Q688G70ZAtN9mwF8nZrW5fOpvA4kNC3p9XOR/ilqn/7/3MoB3HzRDXBz3OA+j56yFKDgSxAE= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:HE1PR07MB1226; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1226; 20:/twnT7pNm93Ft24NymcHr9BoKCGh9RKFeZIcIxLCzwC80r9lA53NQxdIc2YZILfa2ZnVX/+SlNEmjVJbcl9qsD/gmN0264wsVO82InjhG7ggR0eqDQOphq5pXfyYNDEfu20TqLPDuld7DG8Yx7wftoOvXIxIOFXN7+HmM7YxP7zdfuHUSdr3c1V4VWWwjNICUT4cyP513V28rmSp1/XhXP9gP6XRWBHUCF7vEdMN/dmdNRBA+FFRZCOp/OXw5xcLpQe3mtRPlOwcRbkHNmlYrCu8iWa7rvwqbEemyhboI4krbx2yfgEFzxZ9iVznjSygvKpEN41fwriMgEPEYEzh2VNt1JbbXbNKaIXusObmdWPjx+urCuEjxbHaIv+YAXamJsVV8L9VglugZrBYZ+1baxaJHcBPEmKhf6d4Ut2l/l3oTgoMPKssEug63nDLxRplYiwfConqaIEYcKFHVlB3LoRaWEXgrjUahUM/0lnyfNhW/TLgbOMHDVJVrOh3GI/MbV/HDJu8mfj50p5o0LvdHVaOF1SRaoHxYIVQI0m/JuFyfc3JSSW0LiUfUab//UQoy6tUSMfV0Gno7RNXo1gQHPRQRbn7dvwlDM43yIJ7ypE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(3002001)(10201501046); SRVR:HE1PR07MB1226; BCL:0; PCL:0; RULEID:; SRVR:HE1PR07MB1226; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1226; 4:RuhyCP8/DGigzvGKjqyfqjtdoAcXo9EEhkHwkMgf6XoWBiQEkQ7eLPELl7F0q05xNtAweOGS6128y2qRkyVKh3x0gVRKPDleqksDDuRBeRRbj7HnNb7U03K3l+GRPWBUL4dlMQQv6ZBJl54wnYaksy2BQtuZVsq/kHEYOBnSlPp3czUxB85FeBpYpIQML8fCv5hCcN4NG5K8fN1HACb9YXzLURoeQ4X9dJ7jCaG8+ULlxBrVCbm1b+RuyQMogMNfuPRbtOPY0s9vivJ38tKeeQDYd6EJ2poQDJ11rFTsFInIg5fFIJjj5b+rvlwTGGwV9ZYXthtbJtj1Nc8EBGnlwCJd794Unxc+b62hGFkOtaWIGGyybhSi1XFx4KCmPk9aPmOS/9scMKqZHUcK4BofE8eiCtzsOn/aRq31FnqQelc2lp8JR0YqSR6H5SW4Wrlajsw2HQfz/Y/evP4AW6HUCQ== X-Forefront-PRVS: 09860C2161 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1226; 23:Rz16mRzka/yRlP88P+JhjC9iqCqYPnPOBxxSALgXs?= =?us-ascii?Q?40aWelkiVZv+LRiepCeimK514cJhb6+KuhGZGeLsajdmq5D35GSGsN91F07S?= =?us-ascii?Q?eLxqZdhIDMAnMqk1wTomdcWB0PhStrKFn822DGqWea6WPwM0ueezyLZcqOyT?= =?us-ascii?Q?YzR+CWgaKX1mFuVyPSxv/sZuoiISkbTzCo3hhO67CqGiE5Be8/gUhmsq/Zem?= =?us-ascii?Q?phIEJgQED2yhAqXdUdQ6twzAIQm5ACrnQuGqYnyXrK8uBW+JRd2FoWxIzrZu?= =?us-ascii?Q?LVhRJnlcpVUNr16DXw3KqnJZOjyEll0aMpjKzYwRfh4RD3nwCXBf9DmSr6mr?= =?us-ascii?Q?sPCSqgaWefaWXDdz0Baqc9UMeDPB5/ZS3f2sd0R+eyd5/PU6xr/DJRcSuYfz?= =?us-ascii?Q?oVaW7/UL2Imz6PjXhhSiPojdGNbuyBV82lq1Rnn0gKC1ls31k4r/0Nni3V2Q?= =?us-ascii?Q?33oE3uWGBBRE9BHSRws7L0g3R9/UeLkmgjBiPHznoAVNe8/MnduW+6bhM0ZZ?= =?us-ascii?Q?6b5SaGvGERxXpKKwFo7RGKoJB9It3gC5PjgEVLkoGQGa1nA6tmJz7fTmPGe5?= =?us-ascii?Q?oVGKEgKtUjwzWchfkinthUtW/SL8YCs4Lh/fyZtUBBPOkCcyBTKBfO+hDmY4?= =?us-ascii?Q?Y2KVG0VdwfvlJLTxHrBojzqwaeHgx4KttiwO1Y/Gc/ZXpslKs8THMloMHCoV?= =?us-ascii?Q?vUROOCSeNPxOqOhA7rkFwCB2/1Zz/Z5Kqeb9sIjutS503KfQgMiagOX1Sj4z?= =?us-ascii?Q?ADRVGGgOiVMI/wr3CrksWPkOgS+XkhIRi0hoDGjwxvKZJ4wnBAmfz8gtpbti?= =?us-ascii?Q?UL8z6pb8sl419ilO+47uvS68Scq1hG4GLwSNP5DneCOmrgPGYsy50k8pkHAB?= =?us-ascii?Q?yFJnWv2VGDp2LiN39HoOB2Q3jmkdNvB/SuJK5NPRIoiLEUphqcM63WXAGHGx?= =?us-ascii?Q?NYTCPiuTxWlLAptvZlDsEapGpHaABpQNjFKKkoznYHlzbl4sDV+ZDktAXjRm?= =?us-ascii?Q?k3OaAAubphkTGyzxfP+niQayU9MAaDD/uCyewpT752dOsab5S6IxCj9ZV8XV?= =?us-ascii?Q?8DnbCU/nlNrofu1MRNhu24jBCLs+AsXKPW2eYZLTGrG0aELyDvS0UxrDjnxj?= =?us-ascii?Q?Ut+GRhHgmkS10R2O1e5cS9GfM7apNmiawBHHeNy9zrjVS2eNzHi5/Kde01kw?= =?us-ascii?Q?II6K0nvKVksadk=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1226; 6:VIA3FOUE8tku8q5CBXBuv+apWe8VMAZJL8pKrBCSRgELbkfVXh6SXYDVIQXxhlPjTNOp6v99+ecYVDTb/cHOf43pvBOzbSeUKrYTGyR4TQKSvIQVn5WrmU03HG6XoqfZ1rsIqDK6dfwqLuN7MkGUvaJvAvvN9GJrWfvsKjo0J+/aTPgSIvO/BPtu9jBgFprfNQaKWT0nqLe9hJ+q222W5/oKzDCbr36HYfnIUgY+fI8+a+2hqVyQ70hlDS8+BcsdPluCS4NXOr2Aceb87pyINGPn6cE/bFnTANPFO51O1LmhfrDNL9LINCz4cTNS5ZdD; 5:gY01fpIxNQwN7vBtLVA2Xq+dsoHhRytSMBAyOeQhqbjPRnX3fJQftxXvZOZAIpK6xcbqd/mWiYqdZp7NwtucubmFM746nh58kdrhchhickCS17kr17k7bBy9SRZNrgyoLzZjCjZwz8YiFCKA6npEXg==; 24:s3vUNg3OSW/2kUWLV61ifdDMjfaQ42dDO/XIa1qEojzurjGVKNVw5wQ0rvCEYhz05pHctjXOLL62qMFcQi15e11YVv4BgCCM77BImLnvZsE=; 7:V1nmJsMcNUkIXXFUfLoqygSy6gI36q2Z8gETaOJfQElne0CFuzVyvWcgk27tfQeL5j5sgqOaR+3c9fi3HB6EClDSfr+AtUMKJQzvMp0yKKNOwxc9G64nHSPZ6N07r7GoqdRAwyPBFbRbF6fs1s47X0Ylb2nlAGSIYMGpxLRoL0uv/bdbJh3egCo4oBWEZKGvjtLeRceF4rjHZDIrbbTKD0Ec3kDBSdDBpTz8Tok96o4JYpaD4UfZ/CTSb8DeDJ9q0QPycrsxFSgo9XEENPv5mw== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2016 10:20:35.9724 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.241]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB1226 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160627_032112_355933_A90DACF0 X-CRM114-Status: UNSURE ( 8.44 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [157.56.112.101 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [157.56.112.101 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Marcin Krzeminski Add support for new Cypress flash. Difference between FS and FL family can be noticed at 5th JEDEC byte, so update s25fl512s device entry. Signed-off-by: Marcin Krzeminski --- drivers/mtd/spi-nor/spi-nor.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 026544b..182762f 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -920,7 +920,7 @@ static const struct flash_info spi_nor_ids[] = { { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) }, { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) }, { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, @@ -941,6 +941,9 @@ static const struct flash_info spi_nor_ids[] = { { "s25fl164k", INFO(0x014017, 0, 64 * 1024, 128, SECT_4K) }, { "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ) }, +#ifdef CONFIG_DUAL_QUAD_IO + { "s25fs512s", INFO6(0x010220, 0x4d0081, 256 * 1024, 256, SECT_4K | SPI_NOR_DUALIO_READ | SPI_NOR_QUADIO_READ) }, +#endif /* SST -- large erase sizes are "overlays", "sectors" are 4K */ { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) }, { "sst25vf080b", INFO(0xbf258e, 0, 64 * 1024, 16, SECT_4K | SST_WRITE) }, @@ -1572,7 +1575,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) #ifdef CONFIG_DUAL_QUAD_IO spi_nor_read_mode(nor, info); #endif - dev_info(dev, "%s (%lld Kbytes)\n", info->name, (long long)mtd->size >> 10);