From patchwork Wed May 11 07:29:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar Kushwaha X-Patchwork-Id: 620911 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3r4SSv4mn3z9sdm for ; Wed, 11 May 2016 17:30:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 49DEB4B94B; Wed, 11 May 2016 09:30:19 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xr5EbkW8iNJZ; Wed, 11 May 2016 09:30:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EDE604B7EB; Wed, 11 May 2016 09:30:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4D9944B9B1 for ; Wed, 11 May 2016 09:30:09 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VotlWJdqTj_s for ; Wed, 11 May 2016 09:30:09 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0053.outbound.protection.outlook.com [65.55.169.53]) by theia.denx.de (Postfix) with ESMTPS id 516A44BA3B for ; Wed, 11 May 2016 09:30:02 +0200 (CEST) Received: from BN3PR0301CA0082.namprd03.prod.outlook.com (10.160.152.178) by BLUPR03MB472.namprd03.prod.outlook.com (10.141.78.153) with Microsoft SMTP Server (TLS) id 15.1.492.11; Wed, 11 May 2016 07:30:01 +0000 Received: from BL2FFO11FD034.protection.gbl (2a01:111:f400:7c09::122) by BN3PR0301CA0082.outlook.office365.com (2a01:111:e400:401e::50) with Microsoft SMTP Server (TLS) id 15.1.492.11 via Frontend Transport; Wed, 11 May 2016 07:30:00 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD034.mail.protection.outlook.com (10.173.161.130) with Microsoft SMTP Server (TLS) id 15.1.492.8 via Frontend Transport; Wed, 11 May 2016 07:29:59 +0000 Received: from b32579-VirtualBox.ap.freescale.net (B32579-02.ap.freescale.net [10.232.40.10]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u4B7TJGU024408; Wed, 11 May 2016 00:29:56 -0700 From: Prabhakar Kushwaha To: Date: Wed, 11 May 2016 12:59:10 +0530 Message-ID: <1462951756-12523-4-git-send-email-prabhakar.kushwaha@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462951756-12523-1-git-send-email-prabhakar.kushwaha@nxp.com> References: <1462951756-12523-1-git-send-email-prabhakar.kushwaha@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131074253998253488; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(40224003)(9170700003)(33646002)(77096005)(1220700001)(2950100001)(76176999)(229853001)(50986999)(86362001)(105606002)(575784001)(2351001)(586003)(36756003)(189998001)(110136002)(106466001)(5003940100001)(50226002)(87936001)(5008740100001)(48376002)(19580395003)(8936002)(47776003)(19580405001)(81166006)(4326007)(85426001)(92566002)(2906002)(6806005)(104016004)(50466002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB472; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD034; 1:yUNehvorL3y48L6Ce5Y8RDvC6G8yTJ2YxWmWfxf5T42hwOVgpueJwUjZypuLm4DfJ5S1/Lh3vqvQdF4KDsfQjFlshOyKhpjIWsZh4yHxdBEbaEUg3oV/ArfhFSwZZcx+MuqhVw2SGtMRkEAJRJKkRMmAe7LZ2iC8vllRkjjN0Y4BDr9ZVASsJzw2AEAXuS01Y63sGVEbW2tWOHo+BikqqvCRpsx037EXKOWs8Or7V/7vVYsaDmRAVhdf8cQ6UvZlxawnHDr8G94aDhAjYbtqq/HOvLXY2j4ScaD1j4IvcIKpxKGDJgtb/JpxzTEYFaEAf9bnUz7GTPymRzzk2oZTUyhIoVO/syHZuai6PVp91ie7GwA1igL4Slzms2vUSgNXz16787OHY+m526fZZF/yyZmZE19GJMGR3lqW5DwM05EuY/KxG56jF+zlYUwDre/I2AaE2zhcK3u+xMwJXTPqPrE2zX+Y2lBVFxKrEG0UttRujYU1eYS1WGeOhgJYbGbL15lM2GSi7JT2mnSU/wuMIghJEolrYGDNJiblDTuePBTu5lJd1Y2XY6oRdutVCzxHAVmEQFaQfEle9Y+u54MeC1LR3ZT4cWLPIBykfDLOzUAu8hhbu5aNfYTnVQdNLcNWZRi6NfHjtoOaIb/h6h6VQ+8JrLNDeFp9zPLUGCnMqF3pbu34wjXKOiedyik67beNeet0vRKoNq1XJHGX3gJMdw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e6e61116-91a7-4334-844f-08d3796e0f38 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB472; 2:0scGqfK4YkkDIba0WQ1nISqA4tPSgKSo1lopvtUfBd32NtwoVP2rKmgzu7Jbv+kx01vF+zVhs8kCFjTxfLn/ToJ4v/o2r8t2zLZQNIIna+Z1q6HqR13a37JJ6gEMSYLYjgrAdgQuba4KFajssQOGM32+/Pw7xXmo3dZ2wYTRBAU33u5Sw5J3x9BHLagcsgMY; 3:zWkBRkBaL9v1Nr7OtTqt6FhJGwyGEVHmNHYJMMB9uQJ+J9HZLPDIGV82w+Abu3Ygep08m2s3Avy0tQvZRexo06bV8NEKE0cuDi1ixMUkUNH/RNb5rb52gMDNTK++3WmlXYgrjLX1hHN9Y9ILfOeszF+Qswt/UVbWN0hyYlsxlmvqT3VGqRP9wR31q2WU0Laqh9kOhTs58jBvPs9equXqpLuyvwx71UnUUHl6wDDX3N4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB472; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB472; 25:Hmb21o1NQKIa9Pn7mnzQV6c+aEV88KmKnvNzeuoho7FPxSCvQ8HRVM+pmBFy+nzvWj6Id4hn9weBWi9JK0DSkLM6XiyygUsmYdj2ccEIMptFl9MjvUJji+NKjwr1qM4qwek7LKl0lYEtvg3AZGP2p/7t1xIsPJJrk9WlV2rNv2Epq6i1jO/qbzYsVz5axk9mb+Tb97MFLNO3RXRndwCNfzRA7Qrb4CoW/pp5wSFoU13PRmFaj5HDT84O94dp5F34gFP1W3AL4Cwi/FwhtTTfm5Yx5rwzYVZ4RC/n2DlAqD67QbN9TufEpF36w3dT9gMF2vv3z3RAcvzYKsOnVD2svS1YMOYJAf3YFKiPW1j5Th+QTALj5pgDnYg+VElmcrzbpBSMwWPVc3/oNkRbJO3IhCRfSLOrimB/gLKKTtd/iExT+aIH9g3MC3R5RiSLb7ThkLnddK5HwJ0hl2tSBlaaNjNCKdcAylIlUWxVSvVdNo1x0fi9Bhj0QJ+32wI0u7QLXbpqC7NTgAoRGWkann+1XBDqoOG9I5ouPClFmOreGLALFStwtgTR0cbS/HNy5nG+0bVqvYuK2kb6gWiX/jKOCHgp64cg4+oF9Ac/hY0cFLcpZVNVscwLosGQD9f0vslyno2Rx16GTrYBqhCxoFKIirFJrouPJRAkEKznYc5lx6W0p9tB9bUz2/hyITvVluFUFyP1fr6zWkLxPO8IBDWMCW5LugUqL6H90d0b5c8gYv27QJQdjaLvhMnJthL5pIbm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13015025)(13018025)(13023025)(13024025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:BLUPR03MB472; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB472; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB472; 4:5dLPpsrV6shY8ohtv3hzja2RDVpteCQT8F4iHHUe4lZ3hoe3d4x57TUCwCoXRaRw7WWnCx5H6A0fg9Sb0KUDPaXZYX+jmtObUx7Ewc2SBMW0/0xOKzV4WFOsuV/HfmOSrS0yZuG8IJyEIkYXuut8hQl2bgsoykvkmjzVxcBqWDiVVcU6hGoOlXTpMqqLu7R7B064H5OE4mGhF2npwJx0h7wHhT/54RCwtVLYUjMvxIEw1EJ6KkhcnrNNXO8q0k2oRC8lw/0VO7W4hTlJpFAUbidOWPFFnDtAzo2PSqch+JcvZoffxB2PFmqK370x+nAkP5thnhH1iMI+KMwdrODYPqbOzHOb+q648f4xTroOT9cHtbM431Phevq6wchQR3B7g1Z9uN9PaAFG3wpvBVgG2bbQEJ7SVfxrhtrooQepjfoh4jjkZXbuD+sHpzD1iO9CifDFvCyEvrP+SZSgQ0A4S9IHzLGIUs5tFey+MV4b7Ps= X-Forefront-PRVS: 0939529DE2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB472; 23:FY4ECCaTcZLxLh1JGTBG812qXchZ2coKej4e1yHPyo?= =?us-ascii?Q?9epexjV+2pF60a6dglwtRx6yWRJ40Hg8Btf20cGkfCn0yZGMovReAtIEoNtK?= =?us-ascii?Q?EDlBZ0mZX9AWGRCUUBVbNnWBk4+3PwmnJVeYTWonS0PrGUYSuPjRKqs4x4n4?= =?us-ascii?Q?WVQ5A3e/WVhX7T0iwb9cThlj/h8bYxXUJwF3pgRuXKIN9JL4wQ314VnKyFMb?= =?us-ascii?Q?FA/z1ZiGWwjTSIFN+NX49/fM+gTv2X3JicwJPF/7itI78gMv96mkBlm1TllK?= =?us-ascii?Q?fk7pF0CTehVOw0H/6jq3VybfVTM40OEdbfr/3Yl1p8PADwKKj+UoqRIFHHdQ?= =?us-ascii?Q?nZZbUJVyepVx2DTrM7KIAxUcyUVb+H2jD2mkk6ped+PqhEmMtbPAAoCo0fan?= =?us-ascii?Q?axnjseQtk2wa5goFHKyG4ULNfRmq7NGeszsX1c7n7l7W2iSI2Os7D5csYviA?= =?us-ascii?Q?qEdHF5N9rEFPXkgfqu9u1+z+F1wWBDNtm3uHV7Mc1t5GbMctjXCkPC/6K8tB?= =?us-ascii?Q?if8prCOmJKVRIbe47+Sd+AmcDJ/6HZEeFHg63/TV0W1LKMojc4VNYwQN4f1L?= =?us-ascii?Q?2DD6JjTIP3/6VN0OF3wP6tkFdg0IOyfjQFIByJs2+AdWYj041gPkXmbIyBgh?= =?us-ascii?Q?PHzBc9oYlcT+pcq+c6Y1jMTegAj1ZUICpSMWMpAPU8aQO+YhCqPds9H+dllm?= =?us-ascii?Q?AYbh6b+nT9qyvf9KChxqq1in1rO62Aw2VwX/Hw7PG27EpoLWT2rGEScnm+O6?= =?us-ascii?Q?AEM31PtSpCttCZZTKRux8sEP+dgI9JKdjfajmRGLz07pzl+/1B088Yi2ZTng?= =?us-ascii?Q?ExzXTgW3cqOxpjoNvlUU+08lElLri+JDWDTj3fZz5bdVHZZqnUdPLy66SFB7?= =?us-ascii?Q?5f1Vu1OHMwMHpDKByUSPb84z/iho6Qb/1U2IkGfywQDeBXLrX8+PvVuE7T4m?= =?us-ascii?Q?cEUA/le9AxqgS71SoefT/crCBCPzlPDtj3Yhoo78IVSLXJRk+BAQ3PGfOuUc?= =?us-ascii?Q?8bk+eG1Yu2hHcRJxit+TZZpA6z+pZHaptFIxg0VB/jIKM5a5rrUkBj3w/Iy4?= =?us-ascii?Q?p1Gb2MUFprX2bFqm/EOOZW4dX016rFwAIanBYJuMNXcyPo1it1Y2BolMAAUW?= =?us-ascii?Q?25Z3gQ0qg=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB472; 5:PTZRZRxUfUz5uGs0tSDTZ3UG5nxahiYRfQvcdf8Laxrt2ljyk/SZ+vo6raS1AGcomaxLGxgSZL0RfiKdJqtN5up56hD956ky1Xe5GEKFl0c774y9qfg/h86RFCyTG98p9cifgMXEPwT73YZ1oK+h6PK01/a7Z0dsn79IzguruOE=; 24:0HTmRWaxcviRGt555GznkBiMG6Bd/urvZySehfFfOw2s3i6JAj5v7zIs2JcpKZ6QnLL/dz1ue4iG5oOfeMyNUcRsQAFhdx07n+Lf4qzlV4c=; 7:YaaLLPOkukBJoOQaDupqG7TBh6xqXqWtVGDe6maVxbUUr8XZ8sFKTnK44HuhWKOkRTjsQR1pFKd5oJCfXr8+NHVgU5y6GEXxSp6sESY3XetzWb00VqVZKvlr/IKThnq7lWAtrojEwf5xbcn4eNtZTJHNa740aGPkSiv4hw3stu4SBqhen2kQDMW8m2i9098X SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2016 07:29:59.5913 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB472 Cc: Pratiyush Mohan Srivastava , Mingkai Hu Subject: [U-Boot] [PATCH 3/9][v2] driver: mtd: spi: Adding support for QSPI flash X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Serial number, vendor id and page size are added for QSPI flash common on both LS1012AQDS and LS1012ARDB i.e. S25FS512SDSMFI011. Signed-off-by: Pratiyush Mohan Srivastava Signed-off-by: Calvin Johnson Signed-off-by: Mingkai Hu Signed-off-by: Prabhakar Kushwaha --- Changes for v2: Sending as it is drivers/mtd/spi/sf_params.c | 1 + drivers/mtd/spi/spi_flash.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c index 4f37e33..c577d9e 100644 --- a/drivers/mtd/spi/sf_params.c +++ b/drivers/mtd/spi/sf_params.c @@ -67,6 +67,7 @@ const struct spi_flash_params spi_flash_params_table[] = { {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, RD_FULL, WR_QPP}, {"S25FL256S_256K", 0x010219, 0x4d00, 256 * 1024, 128, RD_FULL, WR_QPP}, {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512, RD_FULL, WR_QPP}, + {"S25FS512S", 0x010220, 0x4D00, 128 * 1024, 512, RD_FULL, WR_QPP}, {"S25FL512S_256K", 0x010220, 0x4d00, 256 * 1024, 256, RD_FULL, WR_QPP}, {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, RD_FULL, WR_QPP}, {"S25FL512S_512K", 0x010220, 0x4f00, 256 * 1024, 256, RD_FULL, WR_QPP}, diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index fa0e799..64d4e0f 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1072,7 +1072,8 @@ int spi_flash_scan(struct spi_flash *flash) * sector that is not overlaid by the parameter sectors. * The uniform sector erase command has no effect on parameter sectors. */ - if (jedec == 0x0219 && (ext_jedec & 0xff00) == 0x4d00) { + if ((jedec == 0x0219 || (jedec == 0x0220)) && + (ext_jedec & 0xff00) == 0x4d00) { int ret; u8 id[6]; @@ -1146,7 +1147,7 @@ int spi_flash_scan(struct spi_flash *flash) * have 256b pages. */ if (ext_jedec == 0x4d00) { - if ((jedec == 0x0215) || (jedec == 0x216)) + if ((jedec == 0x0215) || (jedec == 0x216) || (jedec == 0x220)) flash->page_size = 256; else flash->page_size = 512;