From patchwork Thu Nov 7 08:42:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 1190980 X-Patchwork-Delegate: tudor.ambarus@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VgNQ2mx7"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="a1/n/7Ni"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 477xkF1Wbqz9sPk for ; Thu, 7 Nov 2019 19:43:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m/V2Tsajf4DnecYxbQOA36DlK4kbeH8PY1RXNLDx9Xk=; b=VgNQ2mx7kdb8J7 c4AP4DA2jo+f9tzp2uUAbS1zSbLIXCK+hstD8tZkuhyLHbBJZU3+zIUSUcsU77hWHgsGN/cPpgR6E ZuHiFQuQ0rICcz6LthcbAIn2unVGazCcJJiIJcxZMyqh3n5Hm1MKGH3xnNBanM6B1S8QDdyy6N0eE bkPawVNNzTdxYmNN2BdszhTiEPth1Itr4hu0pabjCYk8y7WRWPD8IlXH2LDfbY8EjfdGe/7ebD+Do P3y7UjcdCEC2/uFdbyOMc92LZ/pHoi1WpHIgXcOaYSk3qQzayVwvbvRaEUUUfDf54vtu1+ZUMtLI/ BrYR9skqzsx/ks/+8Fgw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSdNM-0007q7-3r; Thu, 07 Nov 2019 08:42:44 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSdMi-00076v-GN for linux-mtd@lists.infradead.org; Thu, 07 Nov 2019 08:42:06 +0000 Received-SPF: Pass (esa4.microchip.iphmx.com: domain of Tudor.Ambarus@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa4.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="Tudor.Ambarus@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa4.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa4.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa4.microchip.iphmx.com; spf=Pass smtp.mailfrom=Tudor.Ambarus@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: hzzPbrrKpsH8/laMG7UWh7vSjJZLUg1NJpxu11Bkuex+5Ly4hEoA1wBRoZ1+L/4D2ZMI4F8PvR WsaOHVOJvSUNor68ZvrjlRt3T4rU8nRW4HLm+Bpjz7VH5F2q6pySVEh7y3Xe+3pG5ZGkEVLRzN gTBJKEOqZaSd0FS+N2nBDzy87ElzHxNh4zvujIwVhoSXhEHKgD56VkCVn7+hOHBjGsMIOF6yiJ O4NoRtdoe8RHHjV2Bmzcwk+MQl8MqjGkQFQ3hq0aXslcxIfbSPlMu+FG5maUK2a2/2E5vXxrdx el0= X-IronPort-AV: E=Sophos;i="5.68,277,1569308400"; d="scan'208";a="54459171" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 07 Nov 2019 01:42:03 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 7 Nov 2019 01:42:02 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 7 Nov 2019 01:42:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hOO8mYQx6GosarpiJ8szPBdSUQCvRAYlMU4ptNXGvc51m6KteG2NeBmZV8RGSSLeGzSSCWS0zahChMimJvM2IYiEw8xxkKvvsB4VkFmVB09C3NmMJMCJNKRfprXZZEmMVEXOmlonOy3JAiFzD3Dsk50+CQjD1oT/GaeCh0tYAIxaFM1FyyhENQejQLnuYia1KzSUphR6YeAnwj39frtvloDw2M3OHzxHDgpm3naKCORC6CtGksqWPObkaokRKe1JJ9/KE4aENoZ8JrCYekNZghTY7pW4A+HoAfZCvIR1HzcA0mx8LnruJZak1syoG/grBoAtMx2kTjPOqfsxApUnCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2P+tOxWeak9J7ZAXQVrXGCbu5DaL6s0XjXJARa3VPaQ=; b=K2xSJ25WphqcD/R2pXnrJRMTn1UJi8aNcOxa3BFMgVIeE5WhIfUF12TTKY0Mse0dRrFjD9hf6wivS0dxctHMVlJfEwF9nBNxOF9THTMc8kl7MIQm9A2axURvCoCIA9sIEz7gfZ5rxNDdjr3I8DHBcJNXufwtUi6eSKde2MvzR9u0pLDjSxCLJOZUQjhSWpIUh7NlyK2hxxlCWHMadd0Oj1sLb2Y5jfY+B23C6TGshslNABiO0dHtkTQpvJJnlxoSqAPMkKFZdfA98C4H/XNHVRxfKOdkkDwbdISBAeeMvOjyHL+jcFMrtQksKdu8IKTpd57JbZAPnM597G4hM729xQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2P+tOxWeak9J7ZAXQVrXGCbu5DaL6s0XjXJARa3VPaQ=; b=a1/n/7NiJMC69/zVfXQXKK82yOutkdmuZOiIXMtCltp68xQ6deQEaE4t74LyO31ZeayW+SICqzI9xaxS1uFmRKrnH3QD18V4S+Wjbt/HVqeWe2TfEra2U8zCvyOK5pi+i0AQobbSAzNBmjs+l1SKUvnT7cSYM8chKdIGQBmi5b4= Received: from MN2PR11MB4448.namprd11.prod.outlook.com (52.135.39.157) by MN2PR11MB3824.namprd11.prod.outlook.com (20.178.253.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Thu, 7 Nov 2019 08:42:01 +0000 Received: from MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::c09c:36c8:3301:4457]) by MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::c09c:36c8:3301:4457%5]) with mapi id 15.20.2408.025; Thu, 7 Nov 2019 08:42:01 +0000 From: To: , Subject: [PATCH v5 4/6] mtd: spi-nor: Rename CR_QUAD_EN_SPAN to SR2_QUAD_EN_BIT1 Thread-Topic: [PATCH v5 4/6] mtd: spi-nor: Rename CR_QUAD_EN_SPAN to SR2_QUAD_EN_BIT1 Thread-Index: AQHVlUc52k8BvaRMI0OSG2EtSt3f5Q== Date: Thu, 7 Nov 2019 08:42:01 +0000 Message-ID: <20191107084135.22122-5-tudor.ambarus@microchip.com> References: <20191107084135.22122-1-tudor.ambarus@microchip.com> In-Reply-To: <20191107084135.22122-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR10CA0060.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::40) To MN2PR11MB4448.namprd11.prod.outlook.com (2603:10b6:208:193::29) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [109.166.128.4] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7cb39618-276f-44f6-bca3-08d7635e5b6f x-ms-traffictypediagnostic: MN2PR11MB3824: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 0214EB3F68 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(136003)(396003)(366004)(376002)(39860400002)(346002)(189003)(199004)(25786009)(6512007)(66476007)(6486002)(110136005)(66946007)(6116002)(66446008)(71200400001)(86362001)(54906003)(66556008)(64756008)(2906002)(6436002)(256004)(36756003)(478600001)(66066001)(14454004)(8936002)(186003)(76176011)(52116002)(316002)(2616005)(99286004)(102836004)(71190400001)(107886003)(81156014)(81166006)(4326008)(2501003)(26005)(1076003)(11346002)(305945005)(7736002)(446003)(6506007)(5660300002)(486006)(476003)(386003)(8676002)(3846002)(50226002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB3824; H:MN2PR11MB4448.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uTznz3MsVDkt+Ge+xXvmHuuRE2V/LiTCw/TM4vN5TouxYnFpMKlbZjvzLMNnMkl1ucqXZkBZuPgV4gd0tPCAN3M+UlNHhzcAJ2h4ofNIZ9ienQeb1vsQAHkt3Mx86A62ARdTDhtpTl4OgveqHUfPYomTIKY0bdOl3OnV3ts7mCUySUymX3F0ojFev/frqsuls6ddha718GGhNIgOkEMoKrCGLvKmHXiUl4bX8yIhjOK35DbLpVgVH+nUWf/sDk16dwgOVMLRihkhy3i7F1BPGOq5+328/LeYlOD0CfeXr9YEiWAK1NHxeIXlA3wENeaZp5sZjVN/Vj/qKoXSmG3x6UEUB1U25aE0A4y//zvhdR0cqJzg+peQBBa7egq/CECkXTDixgD+OwuiPGbgZQkUCj0jUcBT7GECwInBnhWHrO7w6CBe2dJn5edtWPB4l3+I MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7cb39618-276f-44f6-bca3-08d7635e5b6f X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Nov 2019 08:42:01.4755 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5f2ezRStwHy/f2jkA+qKa8tWPpv0lgmN+FNnNkAt2hfvdjHvv2vzs9Z4u4QsAB0p2dWgrY7elTqeQ0EwY98XHBTYAguKOJf6fztuT/Y0l5o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3824 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191107_004204_736453_A6906426 X-CRM114-Status: GOOD ( 10.23 ) X-Spam-Score: 4.0 (++++) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see ] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [68.232.154.123 listed in list.dnswl.org] 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [109.166.128.4 listed in dnsbl.sorbs.net] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [109.166.128.4 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard@nod.at, Tudor.Ambarus@microchip.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, miquel.raynal@bootlin.com Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Tudor Ambarus JEDEC Basic Flash Parameter Table, 15th DWORD, bits 22:20, refers to this bit as "bit 1 of the status register 2". Rename the macro accordingly. Signed-off-by: Tudor Ambarus Reviewed-by: Vignesh Raghavendra --- drivers/mtd/spi-nor/spi-nor.c | 8 ++++---- include/linux/mtd/spi-nor.h | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index d33ad56d3b67..8c59b5220e2a 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1026,7 +1026,7 @@ static int spi_nor_write_16bit_sr_and_check(struct spi_nor *nor, u8 sr1) * Write Status (01h) command is available just for the cases * in which the QE bit is described in SR2 at BIT(1). */ - sr_cr[1] = CR_QUAD_EN_SPAN; + sr_cr[1] = SR2_QUAD_EN_BIT1; } else { sr_cr[1] = 0; } @@ -2074,7 +2074,7 @@ static int spansion_no_read_cr_quad_enable(struct spi_nor *nor) if (ret) return ret; - sr_cr[1] = CR_QUAD_EN_SPAN; + sr_cr[1] = SR2_QUAD_EN_BIT1; ret = spi_nor_write_sr(nor, sr_cr, 2); if (ret) @@ -2118,10 +2118,10 @@ static int spansion_read_cr_quad_enable(struct spi_nor *nor) if (ret) return ret; - if (sr_cr[1] & CR_QUAD_EN_SPAN) + if (sr_cr[1] & SR2_QUAD_EN_BIT1) return 0; - sr_cr[1] |= CR_QUAD_EN_SPAN; + sr_cr[1] |= SR2_QUAD_EN_BIT1; /* Keep the current value of the Status Register. */ ret = spi_nor_read_sr(nor, sr_cr); diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 11daecc5a83d..364309845de0 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -144,10 +144,8 @@ #define FSR_P_ERR BIT(4) /* Program operation status */ #define FSR_PT_ERR BIT(1) /* Protection error bit */ -/* Configuration Register bits. */ -#define CR_QUAD_EN_SPAN BIT(1) /* Spansion Quad I/O */ - /* Status Register 2 bits. */ +#define SR2_QUAD_EN_BIT1 BIT(1) #define SR2_QUAD_EN_BIT7 BIT(7) /* Supported SPI protocols */