From patchwork Sat Feb 2 04:07:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB7AE6C2 for ; Sat, 2 Feb 2019 04:08:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC25832D4A for ; Sat, 2 Feb 2019 04:08:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0301331AF; Sat, 2 Feb 2019 04:08:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B2E832D4A for ; Sat, 2 Feb 2019 04:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726832AbfBBEHR (ORCPT ); Fri, 1 Feb 2019 23:07:17 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:28843 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfBBEHQ (ORCPT ); Fri, 1 Feb 2019 23:07:16 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="23335987" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:15 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.107) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1rxlCOv40W7jFAfqNY4lvVhJcaiajAM9zDTOjWkm6sU=; b=k5ec38+xq9fHgAlYGfhCq1aQpoQYz72qgmhebRdpmSyCKzUxbED2bs1CsMtSXeHGnvjeNJrolMthPFWHSFtQMNMTFP1seVrEMxXfrWm3KdH1QwsNuzvdJ9GJUi4KnsaNHthbZQw9umeyy2z5eRGSxmlDtz7lo+nSuO/oqgG00Jk= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:13 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:13 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 01/13] spi: atmel-quadspi: cache MR value to avoid a write access Thread-Topic: [PATCH v3 01/13] spi: atmel-quadspi: cache MR value to avoid a write access Thread-Index: AQHUuqzGfGfknscimE6zODgQQX/E9w== Date: Sat, 2 Feb 2019 04:07:13 +0000 Message-ID: <20190202040653.1217-2-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:FjPg9bQQXdLxRWflJHRzEwnZVvhzor/SCAoI86QAqjTHIUiG9/vQHO4fXIhCTbA4f21fGCZAWUFZA6Z1q77rmPGf8NLoL5IKrcwhg8DsBYIGWyX/3J0Bs7BTXXy+xQDTelmF2EmEDXqf9tU+yzoo006O4+myo1+aZMk0S2Yl9xkTeBUbdwETcO6XmYeFLIWL+o5Cfm40BB+iToEL9+1bP4vhtdx4TDtSMbZG4f70jGTuklfNV44Qz2Ef6Y1dFghmkW6NBYciogwAOx/8EzM57xuDSQpYwySKgNY9wjXKAjkC7reRGOyMVfnop+TwMLnDxSY3rcZBsL8mwVOIxRa8jQbKYWDgmu7nlBEhZVhRGkIg5hu7nzhXH3pQj3nhp9n6IQ5yqa0awHks+l8GrKAGzCa9DeLkcCtoGXMJVSxX89qGoTTO4SWbaWWJkWzAvbSXTNzZySX1UILhqnRUGRseoQ==;5:ZAInrhYkqmGNH3MF6MTbcgREKWZ6I0SYPVqcN8USTR+H5wu2n4oRFIyoOeEHiDVS27LbaRU29eZlaJD534FkGBuLurmJbm4a+XNCLeu2jdkxlWts5sOg8qs1rCg+sGauWfRSwf71XrZvt1HSuO5AZu+wi856TEWj2DfOn469U9JSljeFc2jyB9kCFVgyTzNuYns7ZVTHiKdKlT8p2Xe1Aw==;7:dW6uFLFtCbzxb2btsK/FiedtQP06khDo4+LdrdxJJFNfWHGLmHPDGRYGHFZvIwZkW+WHLUndx+taw8tuV0PxO963m+klAvgija08KAQIDy5CXkkQ4s9N/miKIvlgdcgRBhE+ZShdF0kWeIUoYYAKuw== x-ms-office365-filtering-correlation-id: 01cc9d58-3a81-42a3-abe7-08d688c3e927 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: kVHmo5wh59+ZPJbuyFsGJiwrDhgzUre3FdP9PF44cXK5oejCu6wSGXHQ4YhOplSWmnhC3iJz2/wduUAMpwJT75is+uC1eVuU02EsiqvWAc9i5wa/Fb5pcw6+iE/qI9Av8LFPtv7IEWu2Nv4qFePfY/jpdehhsFuniN9Roe77pmY+3baD/r7cbBMqmC1Td8tXt11gCP7tmHLpPJbWA4bS9/zuNNUs6A0xTjqN8Jo1FLcVn1s/m99nU1kizQUrKhzs31WnOp4y9X49LIVrorRZeMm3ao60Evf2Z5o20LZYpDobvcaW+z1Gs/IAtgw+BwvsYYwr83GOu3B4uQ+Z0SQBg2YgDBLGd1VOp5ZB2CF98YS8fnfvHkDiTUvhtAcVXvI+la+ArSWFKSaOaI3z9JbMmWEVtWVrow8jqdRRwpxTfAI= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 01cc9d58-3a81-42a3-abe7-08d688c3e927 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:11.0518 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Cache Serial Memory Mode (SMM) value to avoid write access when setting the controller in serial memory mode. SMM is set in exec_op() and not at probe time, to let room for future regular SPI support. Signed-off-by: Tudor Ambarus --- v3: update smm value when different. rename mr/smm v2: cache MR value instead of moving the write access at probe drivers/spi/atmel-quadspi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index ddc712410812..645284c6ec9a 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -155,6 +155,7 @@ struct atmel_qspi { struct clk *clk; struct platform_device *pdev; u32 pending; + u32 smm; struct completion cmd_completion; }; @@ -238,7 +239,11 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) icr = QSPI_ICR_INST(op->cmd.opcode); ifr = QSPI_IFR_INSTEN; - qspi_writel(aq, QSPI_MR, QSPI_MR_SMM); + /* Set the QSPI controller in Serial Memory Mode */ + if (aq->smm != QSPI_MR_SMM) { + qspi_writel(aq, QSPI_MR, QSPI_MR_SMM); + aq->smm = QSPI_MR_SMM; + } mode = find_mode(op); if (mode < 0) From patchwork Sat Feb 2 04:07:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17F3E186E for ; Sat, 2 Feb 2019 04:08:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 084F832D4A for ; Sat, 2 Feb 2019 04:08:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F08C33315C; Sat, 2 Feb 2019 04:08:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A852331CB for ; Sat, 2 Feb 2019 04:08:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727161AbfBBEHU (ORCPT ); Fri, 1 Feb 2019 23:07:20 -0500 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:25474 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfBBEHT (ORCPT ); Fri, 1 Feb 2019 23:07:19 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="25777618" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:18 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.106) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:18 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wOZ9BpFBEPsFA0EiR5ojy7DVHJASEH6vVKiIOIyJ/6w=; b=khN8+nQXAqMeDL0STjrcgWS6D4NjFVOK2c7ZS9IfShp6w+h5378kRcwee4mRSbc9RoDgXV0+U17DvqSc+YXCr0d2PYEGhttPySp150MiZUrb0oW8AS3VJR5zhpfiU1XltAxK+daKD0eITTAFfB39olpKR2z3e2pBapzYDErDaAg= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:16 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:16 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 02/13] spi: atmel-quadspi: order header files inclusion alphabetically Thread-Topic: [PATCH v3 02/13] spi: atmel-quadspi: order header files inclusion alphabetically Thread-Index: AQHUuqzIGjK71QYKTUiJxXc80Uj4Hw== Date: Sat, 2 Feb 2019 04:07:16 +0000 Message-ID: <20190202040653.1217-3-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:J1mD6W6t0fkIVBr5JdVLYJGvB/qA5Y1UwrZ7FCsl6rxE1vYuEFu5CNMia+VIsO+QfxRNtxBiVyv4qj8O7L/mFnrjtcD8i6HqFLoDZfl7VNXD15qxCF7m47dOc9MYQEEUkXmiD+yqCKigS3m0NI99AZq5YEfb1/V+IJ64hEjbKy20aT1Zu+UHWr7hFUdKkiNaxDVJA6+92eZ4EcIcsaI42G6DnZKFaiaM8nT34oowHh9wXHmltLS9gOEQ2TL6Cd47DX9hWwhHHvv5ZJDEp/i/U/YD5w4BbIsi8OtSZw/zTW8YrkQJVTwKt5w2+XcuyfSXv+1LuDgg/xcZKcwRkNc0lZvBh7r0ASHyeWquLF3EcK/JwH6qSi1/+gX58jllRbxo+VGrCaMdDqbAv5GB5gnHvGRb3N1u//4VxmidtunYLHd95pSoRhSNGMaReuYc8A6snWgC2JgnJvK3xqop1sj9lA==;5:z8ZyFcp/w5B/Xp3/EmFISYEglh7B5uEnfbjgbVNBX0EB2p1i88kYgxNQTKOBVfxYFKSIj9QhmkxHNcHX3ovQ+6luQ3sqLvZWdErzEFh84HRYvMxBKW7P7jBQnruL01yn7LH736ot5dhKSrlWoC/5tRYqAK9Jx4O8FfdjwmbRj7a+aX1GjUUVt7DRHcRBchuDITgsUb4lkV6SptNuqJk4ZQ==;7:Ed6jkTaKB1hCONHZyAQCJljK78tmkvtR95rRdRtp/yBmfDZ8+BHG6yvqwIudpEprC3KyIy9OiggVmwWdTocDNNO14hv//queiNNcm7T/FobyRxpysbpwccPyGFeRBYqdfkZBEqq5X7dHGWenmmBXZA== x-ms-office365-filtering-correlation-id: c5bf922e-7d12-4a69-7436-08d688c3eada x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(4744005)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: AjOfBTZpwzn/Y+hU+oPHrDKMR1fLwXBorNnJl3kEJ7hgBloKWg66OKMZwiHrfgPf1al3uJ2fWYcoDaPgN02/xtuKkwyT9YCEVhURCaRWIHuopBd62JPt37yQI6XHxYQUw2g/LfYV/Fa/MsHSdMWEbipFck77V+L+Er9TjORZLfseJu3ZXj//96bQJZtKSUBWKb45aFTIvrET2FYFPap22mznaCV/MfiYH1TPIa69jMBYcuOYffFqggUnfR3/YZvhDJB7O4h7t0LxEtXOcVNQ5R0O1W3noGGMF8wrM3/X4dQNycXYPyCvwhecusUWXqEwI9O+jwKyU6ZJR0G/anKOxNcCfSWRtfsLsXmfBmA4I4nhS+vWoybNNrtWocyyaRTnP4uj+Ru7dCY1gUFn1TV6SEgwqrFgJdRfthqguz9SS7E= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: c5bf922e-7d12-4a69-7436-08d688c3eada X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:13.9252 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Cosmetic change, no functional change. Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: collect R-b drivers/spi/atmel-quadspi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 645284c6ec9a..feeddcb25e1f 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -22,16 +22,15 @@ * This driver is based on drivers/mtd/spi-nor/fsl-quadspi.c from Freescale. */ -#include #include -#include -#include #include #include #include -#include - #include +#include +#include +#include +#include #include /* QSPI register offsets */ From patchwork Sat Feb 2 04:07:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D6136C2 for ; Sat, 2 Feb 2019 04:08:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DAA532D4A for ; Sat, 2 Feb 2019 04:08:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01CB2331AF; Sat, 2 Feb 2019 04:08:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D22432D4A for ; Sat, 2 Feb 2019 04:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727394AbfBBEHX (ORCPT ); Fri, 1 Feb 2019 23:07:23 -0500 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:55646 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfBBEHW (ORCPT ); Fri, 1 Feb 2019 23:07:22 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="26219228" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:21 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HtbAqREoWkX7nANZbVL3n56uBWF5+XZNtj7XOgfN3X0=; b=2C8GopAhAfpw8rZvvFWHM4/m+zarp5ZfsC8zYfclcwG44vZ6Xxc9z1RD/jcJLVjr3E0SsE/6Xf7qrlqFwjbWTW08Ol0WOytQofSddw53rdAIjpXvMi2tL2B1MsPLWnfl3PHsQfDlAH5hnfh4rj7hJLNBKfsfdh2Fe7cqj8ADWKo= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:19 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:19 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 03/13] spi: atmel-quadspi: drop wrappers for iomem accesses Thread-Topic: [PATCH v3 03/13] spi: atmel-quadspi: drop wrappers for iomem accesses Thread-Index: AQHUuqzK70j+j/B0dE+wG5hbzKgwlw== Date: Sat, 2 Feb 2019 04:07:19 +0000 Message-ID: <20190202040653.1217-4-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:HGidBeeEx5u217OLRTIfr6HD+jpIxuV9p4shWbEJA4aJadyluKCsuq/iK/p+LzYxLIaMIXAeG6cZ0SI2DQqe2PHYsE5D+siZt0hM3jwA9Vp6tZIuZ4K5ooPaq2tPHAgijYEDS/5KORl+aDFH6xviHeDGHavEI1wKU7GvPFbY/zFIOkcmHWMRuaPmelCysRBDQOCMfdfj5GUZ4gUNH029/+/Wi3/P93dFNmO8Ddxd3/NEad91WIXFci1Aea802fw5B7eE6mQq4vLJ4KpaKyyWF/vHmZUJ+1HnDWPuIDN0opCKO8ZofrIRnfREtI8k9sbhDkWQhPiVCjVuIqIcoCjsNtMVzmuFa0nXVpnbUn8ivGYvbnDDx6CQwAl0Y3NXrVybZdqMlwvsZDBk9Hd+K+2XfTQtz/sW79Uz5Ee0NvteOOx6SAzQsy40gnRw6hV9Yy1shsci6BTkVIqIKjTl49cfrA==;5:l7/KOIZPGRn+DlZZvwJK31cbpsaYj86Obab0tJud65KcK7wb0m+zHoWG8vUqWKk+FhV4deWWc8UcI5nG9Ok2hOa5AkWiJh0VgvIBafvXk9ODRXjK5Br5SGGexpqyQUtn17tfBHAkYwTMZwN83VKQPZlbTRbQ2Wf20Jab9fPuR/REsfQLsE3zW+R4Xyjrbik+Vi3TgYyqUEbMtahWqlRo4Q==;7:gs2y53NuKjegj4DX6D31UyNcariDccxwrjGtihGZKqMLU5U8aBS+nBLMQDLUeHBHeVIyHtmcEFzfbrSf8xuI1ALbIL4M1cqxYU8SoJMaJ947WXqXbebW5AWWXPDxUv2heFdEIPv1EVfrINAqsGJzfA== x-ms-office365-filtering-correlation-id: 6876fc07-8d06-43e4-4abd-08d688c3ecaf x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: r6Cw52Y4lj51NHsgIiw8qFkIabLXi8/AQPi3+eZFMWIvY1eITJIKY0Ty6SBXa6VtOYDo9e1gGhVI63i2eYrJT5DZMMLrOCSazold1y9OiW903qj+r+ehTGvEOTOpu0vAZL51TlUHQ6y+rGxreXZn2DHacs7GjJ8N8k1KAKBnGTKuHpdvBwBUoSBy7lB7LuE8Qqu+Jk8mF1WSo5CAEjW3BqpXqEBURot42PJzBOS6apv0pyo6fhypBSwAJnR1Xr75UA+K6mjN41taYoEngT76szIOrqrlJGsuer8qE27MzDqBt/AMAK6mX1ylBJfg6U0JZn7rq14hwg2hv0K5udcYmWT2aRZjSOjXaqjZrnhHORgYcfwF8AJXwwfsrhqUIiWhhxj+SENqd4+4Zemot/3Xp8R0iVDkVtBKbUqfcbVUmdY= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 6876fc07-8d06-43e4-4abd-08d688c3ecaf X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:16.9937 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus The wrappers hid that the accesses are relaxed. Drop them. Suggested-by: Boris Brezillon Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: new patch drivers/spi/atmel-quadspi.c | 47 +++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index feeddcb25e1f..131374db0db4 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -175,17 +175,6 @@ static const struct qspi_mode sama5d2_qspi_modes[] = { { 4, 4, 4, QSPI_IFR_WIDTH_QUAD_CMD }, }; -/* Register access functions */ -static inline u32 qspi_readl(struct atmel_qspi *aq, u32 reg) -{ - return readl_relaxed(aq->regs + reg); -} - -static inline void qspi_writel(struct atmel_qspi *aq, u32 reg, u32 value) -{ - writel_relaxed(value, aq->regs + reg); -} - static inline bool is_compatible(const struct spi_mem_op *op, const struct qspi_mode *mode) { @@ -229,6 +218,7 @@ static bool atmel_qspi_supports_op(struct spi_mem *mem, static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) { struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->master); + void __iomem *base = aq->regs; int mode; u32 dummy_cycles = 0; u32 iar, icr, ifr, sr; @@ -240,7 +230,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) /* Set the QSPI controller in Serial Memory Mode */ if (aq->smm != QSPI_MR_SMM) { - qspi_writel(aq, QSPI_MR, QSPI_MR_SMM); + writel_relaxed(QSPI_MR_SMM, base + QSPI_MR); aq->smm = QSPI_MR_SMM; } @@ -300,17 +290,17 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) ifr |= QSPI_IFR_TFRTYP_TRSFR_WRITE; /* Clear pending interrupts */ - (void)qspi_readl(aq, QSPI_SR); + (void)readl_relaxed(base + QSPI_SR); /* Set QSPI Instruction Frame registers */ - qspi_writel(aq, QSPI_IAR, iar); - qspi_writel(aq, QSPI_ICR, icr); - qspi_writel(aq, QSPI_IFR, ifr); + writel_relaxed(iar, base + QSPI_IAR); + writel_relaxed(icr, base + QSPI_ICR); + writel_relaxed(ifr, base + QSPI_IFR); /* Skip to the final steps if there is no data */ if (op->data.nbytes) { /* Dummy read of QSPI_IFR to synchronize APB and AHB accesses */ - (void)qspi_readl(aq, QSPI_IFR); + (void)readl_relaxed(base + QSPI_IFR); /* Send/Receive data */ if (op->data.dir == SPI_MEM_DATA_IN) @@ -321,22 +311,22 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) op->data.buf.out, op->data.nbytes); /* Release the chip-select */ - qspi_writel(aq, QSPI_CR, QSPI_CR_LASTXFER); + writel_relaxed(QSPI_CR_LASTXFER, base + QSPI_CR); } /* Poll INSTRuction End status */ - sr = qspi_readl(aq, QSPI_SR); + sr = readl_relaxed(base + QSPI_SR); if ((sr & QSPI_SR_CMD_COMPLETED) == QSPI_SR_CMD_COMPLETED) return err; /* Wait for INSTRuction End interrupt */ reinit_completion(&aq->cmd_completion); aq->pending = sr & QSPI_SR_CMD_COMPLETED; - qspi_writel(aq, QSPI_IER, QSPI_SR_CMD_COMPLETED); + writel_relaxed(QSPI_SR_CMD_COMPLETED, base + QSPI_IER); if (!wait_for_completion_timeout(&aq->cmd_completion, msecs_to_jiffies(1000))) err = -ETIMEDOUT; - qspi_writel(aq, QSPI_IDR, QSPI_SR_CMD_COMPLETED); + writel_relaxed(QSPI_SR_CMD_COMPLETED, base + QSPI_IDR); return err; } @@ -375,18 +365,20 @@ static int atmel_qspi_setup(struct spi_device *spi) scbr--; scr = QSPI_SCR_SCBR(scbr); - qspi_writel(aq, QSPI_SCR, scr); + writel_relaxed(scr, aq->regs + QSPI_SCR); return 0; } static int atmel_qspi_init(struct atmel_qspi *aq) { + void __iomem *base = aq->regs; + /* Reset the QSPI controller */ - qspi_writel(aq, QSPI_CR, QSPI_CR_SWRST); + writel_relaxed(QSPI_CR_SWRST, base + QSPI_CR); /* Enable the QSPI controller */ - qspi_writel(aq, QSPI_CR, QSPI_CR_QSPIEN); + writel_relaxed(QSPI_CR_QSPIEN, base + QSPI_CR); return 0; } @@ -394,10 +386,11 @@ static int atmel_qspi_init(struct atmel_qspi *aq) static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id) { struct atmel_qspi *aq = (struct atmel_qspi *)dev_id; + void __iomem *base = aq->regs; u32 status, mask, pending; - status = qspi_readl(aq, QSPI_SR); - mask = qspi_readl(aq, QSPI_IMR); + status = readl_relaxed(base + QSPI_SR); + mask = readl_relaxed(base + QSPI_IMR); pending = status & mask; if (!pending) @@ -503,7 +496,7 @@ static int atmel_qspi_remove(struct platform_device *pdev) struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); spi_unregister_controller(ctrl); - qspi_writel(aq, QSPI_CR, QSPI_CR_QSPIDIS); + writel_relaxed(QSPI_CR_QSPIDIS, aq->regs + QSPI_CR); clk_disable_unprepare(aq->clk); return 0; } From patchwork Sat Feb 2 04:07:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4DAD317E9 for ; Sat, 2 Feb 2019 04:08:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E04D32D4A for ; Sat, 2 Feb 2019 04:08:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3220A331AF; Sat, 2 Feb 2019 04:08:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BADA532D4A for ; Sat, 2 Feb 2019 04:08:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727604AbfBBEH1 (ORCPT ); Fri, 1 Feb 2019 23:07:27 -0500 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:55646 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727516AbfBBEHY (ORCPT ); Fri, 1 Feb 2019 23:07:24 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="26219230" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:23 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.38) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=92djvqjrljFwDc2mR2BUsSiiFrnnqT+LjXGHj5YUxW8=; b=UqAg2BlImYB9hxEJwUVTAYbrgdyAnHLWul3SWIFtJxZ+NyM5+j7+1yQpzeSZC7xOH+dgIs2N3kwr7ErLomoNxUcb4uXgo5epT/EqXCsKAdlqR9CuPP1YvQ90pmE1MIoHmiXCoT6u3EwU9r8sSTlBhExEqwj8MWyK3oX5LxrY7is= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:22 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:22 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 04/13] spi: atmel-quadspi: fix naming scheme Thread-Topic: [PATCH v3 04/13] spi: atmel-quadspi: fix naming scheme Thread-Index: AQHUuqzMH50aknQd3kGkG3IJcminQA== Date: Sat, 2 Feb 2019 04:07:22 +0000 Message-ID: <20190202040653.1217-5-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:/icsmTXY2EUWbJNUozqFfFpO0uofqF7SJnkivtnFJrOcBW4ponjnrUYzamo830aqhkHvuveJL6PVuWTTxIGFeQrpw546Pu4E4vT8U1OEDrgYWhM6gZ5E/PaFmxK87OvA7US/5G7mNgPHyRcoiVYHEimd8YmGHAUE+/WUk0lo235lJsSaRt9jdNoobarBNsgeFQPfV1E49jGCfBndwXMKPnXC7jlU5cHiMc0SCWu36PsF0JV8qE/Lx8m/SeNUtpcDURvvfVfXyvNjxvtW9I/UHHr5u1rm5wDrRJCfsnG0HuLAWIvSKXxWu63QCv6r/4qfOkfUnRLfdoRepYFjlJOVc46fiyyuba70ohlCXKjh9rq20x2m+bKivKThK8ih1DXzsgYyfueYhhtnSF1PPQEQmLvZS5o5Rw7ROjp0NNu1BefbY9x/s7W/hazvlhJmQMhDNPRxA7OBmCnfmoOv8sAuSw==;5:zTgf5tJ4RXuvletiqRVGMjtvBJptRsQWLTJlV5MC2/LN86Hnhv5dP+rtzCEs0VqsPoqDESnI1EfV2Zy66lXWeb5vTPO1y9t7u2KnlTqE/F7RDoWIJJXgI3N8+tbbSekMROx336kfw8sQap7MtoYgLdABGktTgf+Htnt4HX4oywpjDgXM+Mmy4TRnf+OJJyh5o5baSlf+/IPcIs6ywzrDqQ==;7:dIt2/oY8i4zh4Dwuj9OTXsp76GqI5EEQs6AkusQIG0EaXhkU5oLdsHzCleYTHCjJFiSaVYwytu5OiqE9CZP+AqMg+yiWXP2TuT1vdgTBwk03pJMH9nCDSPSPP75maM8XomOAHuS/U9iyiwY0AI7puQ== x-ms-office365-filtering-correlation-id: de2d4e66-f3bc-4195-78e4-08d688c3ee4b x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: mddVmu95POtp0xBSQUjULk89Rgw0B9ZpZLNxIKA7CDS89MYsQ4JWe3tMCdL8mZUidYvMahJs68JY92eLPpQnd0m7+nTYvDkGch8Q3132UiUbx7mLuSkyscdKjQUtze7nApvn9+p65Eq3krYdj/f7rso9m9mVBZIrP/N0C0mVTepCzvhH2bcGwHgAU3Nzvkj5P8SXcB7xFhHdMbX8GkEuz1IqUO8j3C97xhRrh8Wv3su0FoO4ZVUOgGdZatL5sF3xZko85qLsfIHPJI8DihqjRcQzwahaeS9VrxdtLgm3obvY16jhENzFyJsNpkUx2fkqaQ8rH4XxyBoz+m7Lvg61t2/xXYcroIZ2xk7va1C2lJmVKrcIYZg7ljwvC2n1HPKkhZs+dMqIzJfsbWq5fKpXlTqvUw+PD7AfzRUOUyYH4qQ= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: de2d4e66-f3bc-4195-78e4-08d688c3ee4b X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:19.6009 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Let general names to core drivers. Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: update after the removing of iomem access wrappers drivers/spi/atmel-quadspi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 131374db0db4..47ed751a91e7 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -158,14 +158,14 @@ struct atmel_qspi { struct completion cmd_completion; }; -struct qspi_mode { +struct atmel_qspi_mode { u8 cmd_buswidth; u8 addr_buswidth; u8 data_buswidth; u32 config; }; -static const struct qspi_mode sama5d2_qspi_modes[] = { +static const struct atmel_qspi_mode sama5d2_qspi_modes[] = { { 1, 1, 1, QSPI_IFR_WIDTH_SINGLE_BIT_SPI }, { 1, 1, 2, QSPI_IFR_WIDTH_DUAL_OUTPUT }, { 1, 1, 4, QSPI_IFR_WIDTH_QUAD_OUTPUT }, @@ -175,8 +175,8 @@ static const struct qspi_mode sama5d2_qspi_modes[] = { { 4, 4, 4, QSPI_IFR_WIDTH_QUAD_CMD }, }; -static inline bool is_compatible(const struct spi_mem_op *op, - const struct qspi_mode *mode) +static inline bool atmel_qspi_is_compatible(const struct spi_mem_op *op, + const struct atmel_qspi_mode *mode) { if (op->cmd.buswidth != mode->cmd_buswidth) return false; @@ -190,12 +190,12 @@ static inline bool is_compatible(const struct spi_mem_op *op, return true; } -static int find_mode(const struct spi_mem_op *op) +static int atmel_qspi_find_mode(const struct spi_mem_op *op) { u32 i; for (i = 0; i < ARRAY_SIZE(sama5d2_qspi_modes); i++) - if (is_compatible(op, &sama5d2_qspi_modes[i])) + if (atmel_qspi_is_compatible(op, &sama5d2_qspi_modes[i])) return i; return -1; @@ -204,7 +204,7 @@ static int find_mode(const struct spi_mem_op *op) static bool atmel_qspi_supports_op(struct spi_mem *mem, const struct spi_mem_op *op) { - if (find_mode(op) < 0) + if (atmel_qspi_find_mode(op) < 0) return false; /* special case not supported by hardware */ @@ -234,7 +234,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) aq->smm = QSPI_MR_SMM; } - mode = find_mode(op); + mode = atmel_qspi_find_mode(op); if (mode < 0) return -ENOTSUPP; From patchwork Sat Feb 2 04:07:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38A2D17E9 for ; Sat, 2 Feb 2019 04:08:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2853432D4A for ; Sat, 2 Feb 2019 04:08:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C166331AF; Sat, 2 Feb 2019 04:08:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE75032D4A for ; Sat, 2 Feb 2019 04:08:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727635AbfBBEH2 (ORCPT ); Fri, 1 Feb 2019 23:07:28 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:42703 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfBBEH1 (ORCPT ); Fri, 1 Feb 2019 23:07:27 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="24146369" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:27 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.38) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=elFA1QcfrZEA30XZgpuZss4fkHSkW428lF/kU4mXt5k=; b=s+7j1lWdDfA5tftMOQEVRdKfLlgsesIWsR5r6hmy/0dIpZdgPaFQ+GBm6xQ4ma6oua8Aqnd28W+pX+dJiHDjT0rPyfwJRuWGKZ+xY/bKKbFwDlnT8ED7Vg4KEwhzGLFW6P66eJDpsFr9fTuEeZnEJlmZ4Qs1nKaFnboY8mk2/Ls= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:25 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:25 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 05/13] spi: atmel-quadspi: remove unnecessary cast Thread-Topic: [PATCH v3 05/13] spi: atmel-quadspi: remove unnecessary cast Thread-Index: AQHUuqzNPvd1FHWArUOezVdRhueNxQ== Date: Sat, 2 Feb 2019 04:07:25 +0000 Message-ID: <20190202040653.1217-6-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:IQ+RPlTChpG1otdsYPJYM1hL3ZnfBWrnKAb4MImo5Cln50e9FeORkENSVeKXlO60GAY34krSEg+JTRuGaP2nFeEcUcSvraikEsnA9hSKl17DrFImNJbpWKm/py0Yei0pdPQfDTevNXZlH3ZEQ7y6WOrSQtACvkMnQZDD1eme0qa304NFSUmaCfdOUl+xQASijy2ipgne0E8MLJ7o2d+vzs5tTiccS05l9IbWgUT3M4j1BTC5qV0oxa/Qc9xTbdQq1PJh/RqUGDOtANRx8hNRl2/YjHVrlr0Eh7ItbhgZUPtayjN8jTAY8BqawHsyf1ob5D3TvWB7zno1h9H4TZMzcNKgMM9jWN2sANBQgAtoiLDysemZ8bqPF5uD1ddCAXqCfSVV7d8LfebIIDBTLZgPCSkmL1inJxgg0yYJ+a/vR4aNV1oiaudjKt5D/aITD6E8wqCx5d0QO+FaeQlNO275yw==;5:bapbVdrcCWYtUCFATkhaLPm5xSvRP1FIOXkB58izFSv82OXS9MLuJz0t3WfKg5Po/4pGPpQBzIQODfgX7EUGdwb0A79PuCW95nHS33SCSrG9EiqMey8JqevWti5KMXe9c1iVY6t1ZnLpYikMzt73ipM2hDnatGI1VdeOiG0R2VaapgxbKOHIPM7ndqAl2E57XMPEeBYT0Ak3RjYOt1wrVA==;7:hn0C/pd/joVsImnx8/JsC4M08QrZVowopk3YV+rAMS5XTUgFK8H2KFDrPJEpQR0G4ZfwceSZwZeADcAZPY/bX8SoSEa/d+jl7BHJ/y0u4sX7Ndrv1ckaaRUo0NGB/mMgAaXhF+NeRpNNz7n+XuoLmw== x-ms-office365-filtering-correlation-id: e393039e-741c-4d09-c359-08d688c3f00c x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(4744005)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 5WQ0HTODt+8GoaCfxOhZgd80JndGXzIB8B5o+p1p3UOzGltc/wCBDpr9NyciG2Ez7+Zv79xpKFY2rHsNSJsaKErenUNmtpBXR2e1qIrA0LA0FAGHvZJKjtnbx+6E55DIbhfmM/l7y9g0BYswHDo0vz0ROBpTOE/u1Kb92nri2KyfYXMtWARJfxVrbKMBjw93A35MzTKnb1hKUpbamVz/jTL/CSfoD2BTh7zf6GnHlzH7vHQ+Q0qgjH+Hbxc/UPt+yzz9BtOyn5EIDBHYUOl7SxcjuCduMq+6QaL9gDQgiVdIN4XaT4vYiS5irdkuls7v9zwKJzMeSiyMoLYXYI/FmXCqC8g6FruyBNRnfW3vcFQe9zF1IfLkOB4cmo9GF40T4405NTGAAflM1t2pU1P05AvGVKnfc6nxNKrz3nQG604= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: e393039e-741c-4d09-c359-08d688c3f00c X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:22.3773 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus The cast is done implicitly. Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: collect R-b drivers/spi/atmel-quadspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 47ed751a91e7..dbc2c65abc86 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -385,7 +385,7 @@ static int atmel_qspi_init(struct atmel_qspi *aq) static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id) { - struct atmel_qspi *aq = (struct atmel_qspi *)dev_id; + struct atmel_qspi *aq = dev_id; void __iomem *base = aq->regs; u32 status, mask, pending; From patchwork Sat Feb 2 04:07:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C28DF6C2 for ; Sat, 2 Feb 2019 04:08:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B379232D4A for ; Sat, 2 Feb 2019 04:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A714F331AF; Sat, 2 Feb 2019 04:08:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C9C032D4A for ; Sat, 2 Feb 2019 04:08:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727724AbfBBEHf (ORCPT ); Fri, 1 Feb 2019 23:07:35 -0500 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:25485 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727516AbfBBEHa (ORCPT ); Fri, 1 Feb 2019 23:07:30 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="25777619" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:29 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.107) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:29 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lG7iGgTwvPxZQz0QAGw+YOD5d88ma2kLdOUKEE1TsIU=; b=Bss3x2ylW7kV8ZYsT3INc6imcyrx5EeA3tjw6tPLjFzJbE7dsvOaQGXoocP7BoPhlqPGxSFSBwJDjccRyc5Z1pv27LY7e6i2NVQjGDor4LT86WfIDKXom/3NdssTsLlL+djTLygc+A/cvPXtzrZX1IXYdw4EnLaB9xCkscDlLCA= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:28 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:28 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 06/13] spi: atmel-quadspi: return appropriate error code Thread-Topic: [PATCH v3 06/13] spi: atmel-quadspi: return appropriate error code Thread-Index: AQHUuqzP3o+BJj+KVEmV9ZSLE3DYYQ== Date: Sat, 2 Feb 2019 04:07:27 +0000 Message-ID: <20190202040653.1217-7-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:84o0bsYq6K52D3EarS6hP5RvX8lDVMY2VsBw2wcFchIHAJf2bIuh1tNm3sNyVCAGJjTNBWl3b4th3XRPw72DCr0sJsri/JO34mfb/7d6rYxochgPVeF2HbddU3XjIqslbQ+z4H2VpCIpETG8w0E+uQXVGfcutDPNxN0xtFqAxUnZdr1WS5ay7WUkbuYzrvmhEt5l4hKdvWrd+V9VRngwKLiwhuHE0jvlheVfCx8rn0enddXsaZLllvL11mlTawNDrrmQWAJoW6eVbJIMU3r7a0IYLI4h2ka1Sf+tG55Fh9RG0fasu4uAFoq3AAXxNZPkhOrXa7ORet7764ZGteSmyovF97J4aOSFWJ0FwTdq28DYkiqUkFO2ledGFNxnlvEKExUhk0/A2EwfR1txm2g4SE5pGPxFX1lx2sx1Kxo1vSqZyZo++cs8rNlQcIsidLSNy6qx0MrqW/MwjFyaEdpaOQ==;5:hbXm7s5zl5I9fPCfXRqdoQxFU+VHX6S5CNu8o5IpjTSNEADomq33YYeWwBSuqBN0NTfafFdDAAiivOl/myGR+tF2IEDHfgBN56eIAmlXb+lIzH40SECW0coNYRxStthVxv5mh8VEiMGH0rw6mJImMm26v3MeipC6kgNSQxSjiCbnqfS6mDKwo/FVe0XU884naQtYLFvRGbWw3sO9qik+gA==;7:eHUWDHRErYljTPUViERrObfAm/zmTt6RdnKSCJ+N3kKHmpozmbGymfwKx8WpFK3frnMQxBLZoyZ8c3v7X5cMmrR1XTlYHPGzYJZmZLTaXIctjUfC8B3UNKpSJbmb/u1EAIm6+PyEDPFF7BS6HTXrVA== x-ms-office365-filtering-correlation-id: 669bd50b-6762-4342-d830-08d688c3f1ab x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(4744005)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: IfHKrUy0hmkoFoQbLmv3stDkzI2C21O1pkmzNMLEy20YSJJNx3A3maKUFjLF8TBuYZ+9nfagktoe4rdg4qvMmJ9CNS5sDaIvWIpbbleKqRfLyHggz4qaYFaQW+NuQcpJSy28nHOPMr2DobiUeNxprSszx9eXgj/C7O6JpxeLKg12RAy/WEITA4BlUAdzqmkv3uuqQqK9c810oheGNfIDDUpcPEkCqeU/k4VKDdsc2pjtR6jb1kPvHub7fN2je0ReTg/eY3C1kqYS98VeerA7111IQEUpo5GT3ArA8ja8Q1EU2j/YvQEUGCx9lC8ffxq5CH+PimEDCdBKhTZII4iLIE0GPdQolVg9F9a1D0uO8hwbXu4GqkURHLDfYvAkXXr3a7uLgYF4nYA7/Vc1VPpwoJVXN9XxCSyY8uDKJKYNLYc= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 669bd50b-6762-4342-d830-08d688c3f1ab X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:25.3698 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Return -ENOTSUPP when atmel_qspi_find_mode() fails. Propagate the error in atmel_qspi_exec_op(). Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: collect R-b drivers/spi/atmel-quadspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index dbc2c65abc86..80b77eb4ec5e 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -198,7 +198,7 @@ static int atmel_qspi_find_mode(const struct spi_mem_op *op) if (atmel_qspi_is_compatible(op, &sama5d2_qspi_modes[i])) return i; - return -1; + return -ENOTSUPP; } static bool atmel_qspi_supports_op(struct spi_mem *mem, @@ -236,7 +236,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) mode = atmel_qspi_find_mode(op); if (mode < 0) - return -ENOTSUPP; + return mode; ifr |= sama5d2_qspi_modes[mode].config; From patchwork Sat Feb 2 04:07:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8C076C2 for ; Sat, 2 Feb 2019 04:08:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99CED32D4A for ; Sat, 2 Feb 2019 04:08:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D960331AF; Sat, 2 Feb 2019 04:08:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15D9C32D4A for ; Sat, 2 Feb 2019 04:08:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727974AbfBBEIQ (ORCPT ); Fri, 1 Feb 2019 23:08:16 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:63642 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfBBEHf (ORCPT ); Fri, 1 Feb 2019 23:07:35 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="27191416" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:32 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.106) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3pvt00qqVzMLZn/UCJ+/YKsE/CZLw8CWmMBL0wQ7j/M=; b=mODGZ6CicPl1Bx64kftQLKm7kYOoVEHxhuIuH7p/RyjrKLefsJZIE3ucPEOR1w9oJwr86E1yR+DnKgZjpX/oSlEmmaMXfSJQAPxQbE/sVSHrxcqXsasCFXkTxYnAS7YgfuOZANl94p8JJPdXM29X2YjT+7qP3I7a2eZsga2uieQ= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:30 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:30 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 07/13] spi: atmel-quadspi: switch to SPDX license identifiers Thread-Topic: [PATCH v3 07/13] spi: atmel-quadspi: switch to SPDX license identifiers Thread-Index: AQHUuqzRNdsKEnSdbUq+RS9yduoJIg== Date: Sat, 2 Feb 2019 04:07:30 +0000 Message-ID: <20190202040653.1217-8-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:is7X89S7Jl72uzSHnKxDoKgfjj/iXmGHt8XL399G6ha9VIbesuNaDiZhjb+sPOJ6a0gXSQKPdQ6+fonQpakHeyZ1Ij3vrsvpoILoX6ctX1ZWWRM/cj0sZr3/DzDkyhRiH2VnEoTlfdvk79Sg6nAToBCfFHx/grvRDhA21Mdo2VJWcsmdMFRtvToVK8p2nT6Qe3xbIoFiCbiryWvHD2Hp+f+ix4PqRh/+Oe44NG1qXepPvW+3lAtuwSs8a2xai6ECnGdXxkzsdirpa8yfnySqfAaF9OLIevySJqtYJjjnVRtKnTpBqny56x1Pgdetx07Pdx/s9RbLqYctFd28zMnsPnUunTSqZ4zPAAL5COkIktvz1hAW20gcGJDiVq5glvqlApnngi+lYuXWZ3AmBoYiSH544WITYjKBQaBZnzdDy1AfAcpOl/XOGJBoBY8QfDTsDegv03QFTChBzu3a/F4FHw==;5:T0MINPJ5oFfITXtCT1g1RsVmbLgRtg7KgJOzupgR71O85hV/Goxrff/Y7EmNDq5Us9yv8O3WCVOdIqbltW9iSgcmjtvqqdNx0dflr+kamJofuBY15OvULe3xZ10ItO2WA32XqCExTh+QIUle1prQYmBVkoHIA9Dc3ODIPXnZegu3gh9Uydys+4D9GuWyxY+JVpXpfRB6B1NtpnKc7Cp+WQ==;7:zfHBtjKuXFslZIBHAGUh5tEvKyGxwRY0vWe4vcngCFuHYDz49YaAUNHYlW9yapalcSOrQy1i/Ifoz3goRCau8JwKw1ZxjvZ1NgsSnjNVAE9IW/JzmYCWczcGezZ7wWdmWow8JnkT6VRIWDx6tcAUGQ== x-ms-office365-filtering-correlation-id: d462366f-9d59-4691-b00b-08d688c3f375 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(6512007)(316002)(110136005)(1076003)(305945005)(6306002)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Uajh5CXVCQKOxnKSC9kdTLuhf7vGX+FNv6rH39kK/CirpWYQuoO+GxqjqC1jsnxgJCuDT0j5UhQG5JufLwt1m8QDJiVXkQ+Ha6sRz+jmJ7twtqLaz6G2RW9J0xYkWixz7+I0CW5F+cEiwdkneD4yZA7d+48GgJj82a9j+3N2ZrKMi/ZorrSMLcde70q+1kK53SxHVBVoIgf0oxidBvlIZ1pjR26szHkx2wdSaaK29VlTbIPnpZN5fCYivW6rpgtHG5E45mPP+L1Maic9SXFbYZcV5fqpDmF3Yp1mif7Io31r4cmatBWAAtzoVubV0R8ZStUGvhag0/h82klDfBJ2m0hJJ0zD6YdFc7K9/UByDAX6OKd+R05mjEOz+J3VfvKgg5X70IKw2+3Fd0WL9imq4aAXKfGMjoVWDY/Q4b+BIU0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d462366f-9d59-4691-b00b-08d688c3f375 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:28.3653 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Adopt the SPDX license identifiers to ease license compliance management. Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: collect R-b drivers/spi/atmel-quadspi.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 80b77eb4ec5e..d26d4cd0e36b 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for Atmel QSPI Controller * @@ -7,18 +8,6 @@ * Author: Cyrille Pitchen * Author: Piotr Bugalski * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - * * This driver is based on drivers/mtd/spi-nor/fsl-quadspi.c from Freescale. */ From patchwork Sat Feb 2 04:07:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4AD6C6C2 for ; Sat, 2 Feb 2019 04:08:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AE0432D4A for ; Sat, 2 Feb 2019 04:08:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EB55331AF; Sat, 2 Feb 2019 04:08:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFF7F32D4A for ; Sat, 2 Feb 2019 04:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727748AbfBBEHh (ORCPT ); Fri, 1 Feb 2019 23:07:37 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:26391 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727725AbfBBEHg (ORCPT ); Fri, 1 Feb 2019 23:07:36 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="24146378" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:36 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IFRKwjffpX+Irk7YmX6PsJuVxXPeXhl0e0TFr/Y/OPE=; b=d9VRCrBr163Pes7WvdxoGxXYKQyguaEzCPexEBdQ40s7JNeZ/oYGl29PYf4rA47QAQM2k1NNIQaO0FHoNozgxJKE6b35Mjet68W4qwnL7QBwwSLpY6O3p8ZasotuttSXmgSGJZkolllFx9Q/tZWFMfSYCHQj9F5CbIdIEEF23cc= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:33 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:33 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 08/13] spi: atmel-quadspi: drop unused and NOP transfer macros Thread-Topic: [PATCH v3 08/13] spi: atmel-quadspi: drop unused and NOP transfer macros Thread-Index: AQHUuqzSq101Byua1EaKHaxmofM37g== Date: Sat, 2 Feb 2019 04:07:33 +0000 Message-ID: <20190202040653.1217-9-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:bd1rnVvbvJgTmsLgnIsRFstxnhI+pYIOEqkmWSv2DJ/Y7ZMqiw9DCvxl5mAhvgnscz0EOGAENWSUqhk+TWJiuReYqj6OuCkx2CTFp2eU0u4GNjAWEj6rUZQotXJwYGX69yZ68mRH9clgeHY4YXwpUsB7bFAdE9JZSXiLScoNlEomvYFBMTd+6SG1Goa8FK8hOoKR8pL+BXemWAJP3cJznu5cz6o0PERheYHj2lnZeB1g80g7vQpJqMFoFsqLvdWa6jOiO5ZzmE+n1btSKpVlDulIYKj+xu1tuAFkspyQRg/5pAHJ2ZQHLYhulpCTVlWFtm71OoSvOVzC6mGGxUjPkiGNa55HaMD1QDb3OUB8MjbdQV9ZQ99BQ7cU38hHVtjqYiYfqeB4SJUmslCrQYAKZT5hm5iKY5+KdFXpNp/gv+jhz3UiNcZiJQfoyZ86uwTqTdOQ12+8FJ5tLQ44j23Zrg==;5:cdW6tVoA4NrdLaOTHpXQZWc1DRLZ6dF+EhBKl4ZmW+QJ1655AkfVXRc3cdZtIa0UNMSgBIP8DgVUrZnWy/5PLSOxwRdAvYYmf4zZrP70hEwtPtkAsO9hOcnq0HGSsvMpjA5sLfypVGALbeIYerf1Gl8m1TOJZhW2dVohEZwL/QG+qsJZg1ROFVctO5xLoIE6GNWocNgE6hVNye0C12OW0w==;7:5VsxWZM9IfqomhBIXKzQJwQ3fkeVvCxlg3k/ajcPJLZcM1/lpjHlHnQxmLsZG1H996k+lctI2WQ84WQaMll2GA2l0S64ShcL2sGYpdEv3FudAHdvcoY1Uj+Qmm8gbMnxv4waW9NiuLw5mcMcNQZLQg== x-ms-office365-filtering-correlation-id: 0459dabc-6e85-4e82-f777-08d688c3f50e x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Jyu5Y6mdM1/mNlhJu2CMZgug/BV8wc5zG7zVEnzt1wYVHPK9kKBA3wOSaME+rezMBOp+qTzzb5cb64fOw9XEMwCCxZaG6Xq0d/oh7uTUgRHgOYNzsQb9HQ6OpxH0el+hhxKOjU1LhWtwuIL6E5GNuW/IlEKmDAQM+K/nbAUgNQkQgqt23V5maxBMM/GA4Z2iknjW5SdV5xoE//ZqbKd1RcLCGab7YB31HbnbiaCfy3meqE3I2kvCD+RWjtLXjmS+CJ21hQE+fADWht7UgcQvIuTSYeHE4m/0nfBjDPBufx6V5X0w8fnyhgydTZRSvAzod6ZnG7afON5XppZSy/ZRvT3pfN1u3lzXJVducHf+dfMIQWSbngkt1RRqO4FYcxN1wJ7VXC3zDMSOf+cie2hRzEvW/xnV7f9+AcuczeT9kB0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 0459dabc-6e85-4e82-f777-08d688c3f50e X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:31.0595 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Remove NOP when setting read transfer type. Remove useless setting of write transfer type when op->data.dir == SPI_MEM_DATA_IN && !op->data.nbytes. QSPI_IFR_TFRTYP_TRSFR_WRITE is specific just to sama5d2 qspi, rename it to QSPI_IFR_SAMA5D2_WRITE_TRSFR. Signed-off-by: Tudor Ambarus --- v3: new patch drivers/spi/atmel-quadspi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index d26d4cd0e36b..bfa5f5e92d96 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -113,11 +113,7 @@ #define QSPI_IFR_OPTL_4BIT (2 << 8) #define QSPI_IFR_OPTL_8BIT (3 << 8) #define QSPI_IFR_ADDRL BIT(10) -#define QSPI_IFR_TFRTYP_MASK GENMASK(13, 12) -#define QSPI_IFR_TFRTYP_TRSFR_READ (0 << 12) -#define QSPI_IFR_TFRTYP_TRSFR_READ_MEM (1 << 12) -#define QSPI_IFR_TFRTYP_TRSFR_WRITE (2 << 12) -#define QSPI_IFR_TFRTYP_TRSFR_WRITE_MEM (3 << 13) +#define QSPI_IFR_SAMA5D2_WRITE_TRSFR BIT(13) #define QSPI_IFR_CRM BIT(14) #define QSPI_IFR_NBDUM_MASK GENMASK(20, 16) #define QSPI_IFR_NBDUM(n) (((n) << 16) & QSPI_IFR_NBDUM_MASK) @@ -273,10 +269,8 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) if (op->data.nbytes) ifr |= QSPI_IFR_DATAEN; - if (op->data.dir == SPI_MEM_DATA_IN && op->data.nbytes) - ifr |= QSPI_IFR_TFRTYP_TRSFR_READ; - else - ifr |= QSPI_IFR_TFRTYP_TRSFR_WRITE; + if (op->data.dir == SPI_MEM_DATA_OUT) + ifr |= QSPI_IFR_SAMA5D2_WRITE_TRSFR; /* Clear pending interrupts */ (void)readl_relaxed(base + QSPI_SR); From patchwork Sat Feb 2 04:07:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBDE017E9 for ; Sat, 2 Feb 2019 04:08:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACA6232D4A for ; Sat, 2 Feb 2019 04:08:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FF25331AF; Sat, 2 Feb 2019 04:08:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3675B32D4A for ; Sat, 2 Feb 2019 04:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727877AbfBBEIG (ORCPT ); Fri, 1 Feb 2019 23:08:06 -0500 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:25495 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727766AbfBBEHj (ORCPT ); Fri, 1 Feb 2019 23:07:39 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="25777622" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:37 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wfsyMf/kEpDa4FIEF9Vr7A/njHirUhN3QsSOsOYW8sc=; b=U11STUNTBoBhgL/GsYTR3SxasiYZhTfSOEG3rp6EsGqm2ulwVd/Q0OA5K6pWhfyIQfURh2mDZsVTx9iE895xyhUSqnaRbBAw2eNdrBNjQrjCnd7JWH/c60B4eeANkISnhUxfPHkr1ip6hP1I4UG0ZiW4I+uANimsPYr2Mw/teGk= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:36 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:36 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 09/13] dt-bindings: spi: atmel-quadspi: update example to new clock binding Thread-Topic: [PATCH v3 09/13] dt-bindings: spi: atmel-quadspi: update example to new clock binding Thread-Index: AQHUuqzUD5rUyBAMmUemMqz3/PSN4w== Date: Sat, 2 Feb 2019 04:07:36 +0000 Message-ID: <20190202040653.1217-10-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:Ox/X6os129ogSKr7NwpunFYPn13P0VmeOv42K7ozb8JlA0UAnlGd8mqrhtJcwGdX1kkOBRaENWZeW48fvJzUbHnvHmKXs75wwsVHeavxwpKaVA1DJ/b2vPzOa3IBOfEDMCut1pHG8sU99TxRh7Ls+J6KF/Zs1D5rXmN0gk1WDUF+byG3vIP+bpYPL2Nz6fzhH3/fIDs1bfv5boSw7KPC9DJfy8nY6FVTaLmwlwc0HwZ9RcYJ8GQplDcAM7f3Gc4UaceCmxqZP56VI3fdgoIzBhQ/RtKB+wlR+DnIg2NCLLcAfiie6nJFTGj2xY24z+JwNGV7PK7WZZvXPnQMRsMILSDSONdWBA7f/nVZQB7FIfau/bqhE95dhAvOO0/qe2X6usDw3PEo/9JTqJYR+p1S6LtFeU9AopdEiIUWXJEFn9Abfsw+0+i8wlEcBGP5xlpX256TIbMhfYdKLpBArRqI6w==;5:3k2E5yiOdzysBq5NTrgOADhX96W55QV3EA6X+4lhu8jgMAt2Bo8h1FnPwzcYjAmPc7a1g6rQw9JBNZBdr2K45ROTJS8/H37QcLXyvy7PEbOjDLxyzFneKeg6yHM0WoRNGdNWUQBGzK/BXoyJaeA/BOxg4x3jsEhPn4AohJMKV0b3kc+HskLjBVZqJuRDSfS7DxMxUIxWtzuf0VftEl5L4w==;7:RnwuAJrNyqVx6Hkd+4bjz+a2EqeldDDfqJhbcMrRoLM6UqYgziUs3LDGivZKkLYcw09SXmkltt3mrLQC7qLjsVzon6863rKCDwuEG6TZWmjwaasEtzWKFLLlhWbH+WJ6ng7Z2z+lFz4JUXRLfQwPnA== x-ms-office365-filtering-correlation-id: 248f9fcf-b192-485e-66ed-08d688c3f69d x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(4744005)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: u1e8epatYhcGdYHTU784IDmP5eovD0mSjM58+YEqw6DMquC5Liy0PyJxTDHZUV/mgr8xNsNiUPB1oVqCS6s9ziyWl3TkNuQIdhK9p65Ueu5mAH1js7F56ztHv1BGZ9T3EDOwHsMmy7iNU/oz1raqh4qt5Bsun/iGs+cRzMcMHn5S9MPmV87UzCYIcq2zanEsoxOji0z92fVq45bc0ISw1YVsFBax8bmmpMDt1KtnCskkaYzuEIiUhVhiA9TI8lfKptiF2FAGKIlY/aoSasvTw9VsA7mggC4D3KjR/ygF+5+DSmxrMx9WaN+q9H/d/r9ut1ekze10C2ispCT7NwXs8+SFKKPQ33MtvHF4PSEOrc8w57uOTL6zJGbVDGfzOli6MbkkfaykMnjmPhYfAxzrP4yl/bt4UB6aJ8qHAaz5Dy0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 248f9fcf-b192-485e-66ed-08d688c3f69d X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:33.6657 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Introduced in: commit b60557876849 ("ARM: dts: at91: sama5d2: switch to new clock binding") Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: collect R-b Documentation/devicetree/bindings/spi/atmel-quadspi.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/spi/atmel-quadspi.txt b/Documentation/devicetree/bindings/spi/atmel-quadspi.txt index b93c1e2f25dd..e9dae6264d89 100644 --- a/Documentation/devicetree/bindings/spi/atmel-quadspi.txt +++ b/Documentation/devicetree/bindings/spi/atmel-quadspi.txt @@ -19,7 +19,7 @@ spi@f0020000 { reg = <0xf0020000 0x100>, <0xd0000000 0x8000000>; reg-names = "qspi_base", "qspi_mmap"; interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>; - clocks = <&spi0_clk>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 52>; #address-cells = <1>; #size-cells = <0>; pinctrl-names = "default"; From patchwork Sat Feb 2 04:07:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 722E86C2 for ; Sat, 2 Feb 2019 04:08:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61EB73315C for ; Sat, 2 Feb 2019 04:08:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52FDC32D4A; Sat, 2 Feb 2019 04:08:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E140C32D4A for ; Sat, 2 Feb 2019 04:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbfBBEHn (ORCPT ); Fri, 1 Feb 2019 23:07:43 -0500 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:51707 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727790AbfBBEHm (ORCPT ); Fri, 1 Feb 2019 23:07:42 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="26062099" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 01 Feb 2019 21:07:41 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.37) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z8cR0aSyph+qDC0ZF+ga97oZmkbtZ/HiJNZqcC0r0/Y=; b=yq6ShrueHp/4OGJbQTKMpVIS+BxxM6sAQ9ao0RrDCFaDbhuXXXVwnH08Y4u7oiI1b31PocfDFLtU5Dw8s37R7zIebmQWueiF6M7Sx5bP4JyQkKNTC5Fwv4bY53lqaRxPbuImQW+EFf+B4FGH7F8/fuSc9qH+qrR25cZIIuGAGLk= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1987.namprd11.prod.outlook.com (10.173.33.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:39 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:39 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 10/13] dt-bindings: spi: atmel-quadspi: make "pclk" mandatory Thread-Topic: [PATCH v3 10/13] dt-bindings: spi: atmel-quadspi: make "pclk" mandatory Thread-Index: AQHUuqzWMMnmbraYeUy6BKjmB0h60g== Date: Sat, 2 Feb 2019 04:07:39 +0000 Message-ID: <20190202040653.1217-11-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1987;6:G7eQEyq0yF5a+47TA0yrz5srCSKMs/D/dlv3PcQM/d6zsZOPnUrt27AQJXmAo1xePs7MiKaJJzk3b+OWNzYGrwOeoKOQVdmLSEgX8WbBOjfZzVoEUZoFwP0JY4Ygne8NgRG4H5xnasuyTx3ToAhVKnP8wmzvYzsI7Z5g272rhhaHMIQwCjh6FgJaJ9MOtEJaXU4cc3OMwSITGPRpNPWKH4QyEiBWtyuyXldVI2PxVbGuvIEwQVONz3NNr27KcoQ/w1eQxwshITI4eICYwbrKiRV6Lr70kCQsFkElk0JZ/ufAdAXDPaRXgS4MTY127RiaW3428/PDSvevVXUkDUFuptuEDfxm32h2a7FuxlfI5aaI3DCGPqQUYc8QdTg+Es9L/G1W+/qjXg/w1RnSNmKQfzAcFbyD4Ck737XvqYGyRboNmkjj6oNA8jCmbOggnluGcBwKMXd8oR0VQY+Qlszraw==;5:Ce/WMXyW8K8dj2vJ+zJPhueGMN8ynUPsmsrjKSOAexTLHUjdXZp1x/uLG58XrbpTt/qKO68SU7TJc7cRc73wJJx695+6F/qR6fjKo9+jNguztETLnRnPv4GTqD4ZFAwHtxc4Y+e/bvovGdCURmFi4uL5m4D7rTUfOR4QRYjemUNlVHHsldMUDNosf4HrTsGGIf7O+Q3ramR7aaEL3onPvg==;7:Zw7PV/KUV7riCMsXpywxDc/o6iX4QGGdWOjnZitps1sMpwNEn/oo4aas7+/pd7yUPi2k9S+LOpojWZtrKr6wYf+aWMdgnpHw3V2IvPnSTAfg8X0IqLqUL4D3fCH21oD6WzxeAEMelREtkaKgJt8H6A== x-ms-office365-filtering-correlation-id: 96793553-5f96-4e65-88d3-08d688c3f84a x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1987; x-ms-traffictypediagnostic: BN6PR11MB1987: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(366004)(396003)(376002)(39860400002)(136003)(199004)(189003)(97736004)(76176011)(4326008)(1076003)(106356001)(50226002)(66066001)(6506007)(386003)(53936002)(52116002)(107886003)(105586002)(2616005)(72206003)(71200400001)(39060400002)(446003)(6436002)(71190400001)(99286004)(256004)(8936002)(186003)(2906002)(25786009)(86362001)(11346002)(305945005)(14454004)(36756003)(8676002)(3846002)(6486002)(2501003)(7416002)(81166006)(478600001)(54906003)(81156014)(6116002)(486006)(476003)(110136005)(68736007)(102836004)(7736002)(26005)(316002)(6512007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1987;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Fz1KW/yFx076I+gChiSaPgEkLIJDB+Rz+ULoU7uPN0fVcPrkomIkofAJCgnZ9mrPYDDNskeHyvEKJ6b5Ijy958ETCYq5Lrqz6f4MHzlZ7QmPrpJ3m4uMuQ03XC7598bl7DPncheyHvbWy+lj+HJJzgMyeb3nlNwvmVFhy5FnK0XqSsiyNckfGA1qa0LpgptLY2p0DEU3oVC0ToMw2gpZVEX2qoV13dAqAUnCa6Y5WZkDcColmbw9R5fN0BRhtr2xuGB6zVkRJg7ADGSvlkLlcmdG3Rqa5zFkmdHkjARZfXz14ijYUHu3MZ7GDFuN6nalvcaBNkmpKVcfHLuSEKw1VNjsC8ipKf8mqXGO07VU59qzj8z2s80agp33CzUVfKjgYgQ2SshZWuAQZJDwhK33sa6A+0NHZ9E1JK+uIQNdUP8= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 96793553-5f96-4e65-88d3-08d688c3f84a X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:36.4681 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1987 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Naming clocks is a good practice. Make "pclk" madatory even if we support unnamed clock in the driver, to be backward compatible with old DTs. Suggested-by: Boris Brezillon Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: new patch Documentation/devicetree/bindings/spi/atmel-quadspi.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/spi/atmel-quadspi.txt b/Documentation/devicetree/bindings/spi/atmel-quadspi.txt index e9dae6264d89..1de54e87f5d6 100644 --- a/Documentation/devicetree/bindings/spi/atmel-quadspi.txt +++ b/Documentation/devicetree/bindings/spi/atmel-quadspi.txt @@ -9,6 +9,7 @@ Required properties: - qspi_mmap: memory mapped address space - interrupts: Should contain the interrupt for the device. - clocks: The phandle of the clock needed by the QSPI controller. +- clock-names: Should contain "pclk" for the peripheral clock. - #address-cells: Should be <1>. - #size-cells: Should be <0>. @@ -20,6 +21,7 @@ spi@f0020000 { reg-names = "qspi_base", "qspi_mmap"; interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>; clocks = <&pmc PMC_TYPE_PERIPHERAL 52>; + clock-names = "pclk" #address-cells = <1>; #size-cells = <0>; pinctrl-names = "default"; From patchwork Sat Feb 2 04:07:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEF63186E for ; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFA7632D4A for ; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4104331AF; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40CA63315C for ; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727833AbfBBEHp (ORCPT ); Fri, 1 Feb 2019 23:07:45 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:63649 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727821AbfBBEHo (ORCPT ); Fri, 1 Feb 2019 23:07:44 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="27191417" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 01 Feb 2019 21:07:43 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.37) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:43 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Y3Uibd1NZX0+3oHC7U/Wkfpo4Ng9m/CQ/smEtm7FHI=; b=kEcjPAUdGMlILaie8DvayNddlnWxiYA6CtZuVVRkWXQYrx2KLi9ZOyFUGS37K31r/0zakKtL57NmEHaxh3MoPAY/deFjoohezRO8Aw+tGFbSE0Xqk5SMmggUpQVb+GOz0cZg5uWQtaSpJ1T8OBsuhWV/vZAQKfMh8ZrBPe4uwOY= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1987.namprd11.prod.outlook.com (10.173.33.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:41 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:41 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 11/13] spi: atmel-quadspi: add support for named peripheral clock Thread-Topic: [PATCH v3 11/13] spi: atmel-quadspi: add support for named peripheral clock Thread-Index: AQHUuqzXSgm7woYfP0qoJQpPc0NVWQ== Date: Sat, 2 Feb 2019 04:07:41 +0000 Message-ID: <20190202040653.1217-12-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1987;6:nv4/9FTtBPgPM/Z1RONY5tfbVKGCi+HrzbqJHsdgAPlQ5Qr2Z6uWl1XTLHMowHYGRXKFM1cdX8MUccmlH4sG15q7xYxJtJpMVkhYqsgFIuglDXoDGDF3gEVl4j7JG/P9P7glVK8RuDso9CRKVrI8/XaYGUrLjbDdM715OauloXyBmo/LSicwdAjnhecT4SmXvzAWtR/KNBrkrkec5U4M3kVR1fMKPesgYgAQjFlobnSqwYwJKKLmBUeQ5mjr6L/4QSTSm3LnyqvzD7m9eyhKuCorm0/kU5s+VpF64hXiOhnoSjz+abqU4UqoGI+JyeeAdA9hVjDP+Vq6D6hpZCsvkIUI4SEz6mk7EXP6xUuY3eUJ4M+zZTnw/wthpg0vse1uXenT/kWYys7UlIv6NlElhq22Yt7pJtGFVpVXQRIw4/VPr4Z1NivEj2mZFfpqL5A/E0w5FyMoivS2t4xWP/32Cg==;5:2JNv3Xwbln1/CRPbKfNDHj2MTvGuOvcu4SteiIKYEY46V0/qo81dpsxQzzHu6uZAJ0JBmx0wYMI+WHCzx6l5itY9Vh0ieE5q9i7rXszeaHfiWx9ralHtt8L6G11WKhQEXIFMwQeJs4d1AVQW8fkTagLeVzbmpKkr5ZfWNDiUrZGQuUyC0SupHu2ncaXdbvK3eaNAdcxRkKH9K7rTRjoCPg==;7:fiCTDMRtEuFPr8xIaS8dkqiPAtegcCziJuoIb1eEZS/foefAyD7QVRbIoIk3G40ObdrM2PdJ+aJWennb7KkcHUP/pyx/UyTAh4lm7oxIrI3o4xwn53mC3aEK5Jk9WW5sc8VtfMjnDYltpTvC6ZeJCw== x-ms-office365-filtering-correlation-id: 50829745-8dfc-4938-66a7-08d688c3f9fc x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1987; x-ms-traffictypediagnostic: BN6PR11MB1987: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(366004)(396003)(376002)(39860400002)(136003)(199004)(189003)(97736004)(76176011)(4326008)(1076003)(106356001)(50226002)(66066001)(6506007)(386003)(53936002)(52116002)(107886003)(105586002)(2616005)(72206003)(71200400001)(39060400002)(446003)(6436002)(14444005)(71190400001)(99286004)(256004)(8936002)(186003)(2906002)(25786009)(86362001)(11346002)(305945005)(14454004)(36756003)(8676002)(3846002)(6486002)(2501003)(7416002)(81166006)(478600001)(54906003)(81156014)(6116002)(486006)(476003)(110136005)(68736007)(102836004)(7736002)(26005)(316002)(6512007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1987;H:BN6PR11MB1842.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 8X4BtiSF5drvCccinWA9S8Mag+BVQg3p/S1mVeK8pPBMPpGOyjiFdKUkgxf6SjL8DJLu06XDpOW3B5Bmy065yJts0L4LfTQAdlo/FqoOWglWgOQ7WhJOkYAYCXNvM4rliCfiFZZlVmaz+enD1zGfR16KafL3745hMAmxHvFW1jMBJxFid/LSSU4VbKxbvgacXiBags7JJwOb7oAKCMcUgBtzXC3XmJcGxeTYNPSrl0lbSspHPwMHcBZGKLjQQlpJq5nBiaSqwSL3n0e6dXNwYp7U1VKz4qJPuKJLw4y3ezvo1BLNI7Sa2GH0XYp0zMjfF3KpNXJgttJHeTLlIGDQENYHdYj2CTDWmFCKcV1RlD+XBrU9Sk8h/VlHukYg3PQ4iBX79AOj2eJ6M23fNJpTsXFw4czDaNR9a7895JqU+LE= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 50829745-8dfc-4938-66a7-08d688c3f9fc X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:39.3185 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1987 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Naming clocks is a good practice. Keep supporting unnamed peripheral clock, to be backward compatible with old DTs. While here, rename clk to pclk, to indicate that it is a peripheral clock. Suggested-by: Boris Brezillon Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: new patch drivers/spi/atmel-quadspi.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index bfa5f5e92d96..c9548942535a 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -136,7 +136,7 @@ struct atmel_qspi { void __iomem *regs; void __iomem *mem; - struct clk *clk; + struct clk *pclk; struct platform_device *pdev; u32 pending; u32 smm; @@ -338,7 +338,7 @@ static int atmel_qspi_setup(struct spi_device *spi) if (!spi->max_speed_hz) return -EINVAL; - src_rate = clk_get_rate(aq->clk); + src_rate = clk_get_rate(aq->pclk); if (!src_rate) return -EINVAL; @@ -429,15 +429,18 @@ static int atmel_qspi_probe(struct platform_device *pdev) } /* Get the peripheral clock */ - aq->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(aq->clk)) { + aq->pclk = devm_clk_get(&pdev->dev, "pclk"); + if (IS_ERR(aq->pclk)) + aq->pclk = devm_clk_get(&pdev->dev, NULL); + + if (IS_ERR(aq->pclk)) { dev_err(&pdev->dev, "missing peripheral clock\n"); - err = PTR_ERR(aq->clk); + err = PTR_ERR(aq->pclk); goto exit; } /* Enable the peripheral clock */ - err = clk_prepare_enable(aq->clk); + err = clk_prepare_enable(aq->pclk); if (err) { dev_err(&pdev->dev, "failed to enable the peripheral clock\n"); goto exit; @@ -448,25 +451,25 @@ static int atmel_qspi_probe(struct platform_device *pdev) if (irq < 0) { dev_err(&pdev->dev, "missing IRQ\n"); err = irq; - goto disable_clk; + goto disable_pclk; } err = devm_request_irq(&pdev->dev, irq, atmel_qspi_interrupt, 0, dev_name(&pdev->dev), aq); if (err) - goto disable_clk; + goto disable_pclk; err = atmel_qspi_init(aq); if (err) - goto disable_clk; + goto disable_pclk; err = spi_register_controller(ctrl); if (err) - goto disable_clk; + goto disable_pclk; return 0; -disable_clk: - clk_disable_unprepare(aq->clk); +disable_pclk: + clk_disable_unprepare(aq->pclk); exit: spi_controller_put(ctrl); @@ -480,7 +483,7 @@ static int atmel_qspi_remove(struct platform_device *pdev) spi_unregister_controller(ctrl); writel_relaxed(QSPI_CR_QSPIDIS, aq->regs + QSPI_CR); - clk_disable_unprepare(aq->clk); + clk_disable_unprepare(aq->pclk); return 0; } @@ -488,7 +491,7 @@ static int __maybe_unused atmel_qspi_suspend(struct device *dev) { struct atmel_qspi *aq = dev_get_drvdata(dev); - clk_disable_unprepare(aq->clk); + clk_disable_unprepare(aq->pclk); return 0; } @@ -497,7 +500,7 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) { struct atmel_qspi *aq = dev_get_drvdata(dev); - clk_prepare_enable(aq->clk); + clk_prepare_enable(aq->pclk); return atmel_qspi_init(aq); } From patchwork Sat Feb 2 04:07:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794067 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A329217E9 for ; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93A0132D4A for ; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86E95331CB; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1865032D4A for ; Sat, 2 Feb 2019 04:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727863AbfBBEHu (ORCPT ); Fri, 1 Feb 2019 23:07:50 -0500 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:25475 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727821AbfBBEHt (ORCPT ); Fri, 1 Feb 2019 23:07:49 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="26062104" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:48 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.49) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9k/sBMT6uGD+/G5HsSqckaBWKQqACtT+I1jNsAx2R0k=; b=aGKsTngwUWE2uSlD2y79oa1gekV1kuThzpFpsUud/fEJnflgCJVhw2sa0OuQF+YF2CySvetCa46pE1KoZ+vEarfpnUxT7cBYBgn1NeBp9uylYREF85Z6ddPLfBdd2Y90uG4RwU5XE65NU5ULOb1dchno/Hgw/LCEe9NY90eTmng= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1812.namprd11.prod.outlook.com (10.175.98.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:44 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:44 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 12/13] dt-bindings: spi: atmel-quadspi: QuadSPI driver for Microchip SAM9X60 Thread-Topic: [PATCH v3 12/13] dt-bindings: spi: atmel-quadspi: QuadSPI driver for Microchip SAM9X60 Thread-Index: AQHUuqzZe8aclldzlkqIHoRq0DqenQ== Date: Sat, 2 Feb 2019 04:07:44 +0000 Message-ID: <20190202040653.1217-13-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1812;6:xUVxJKnNKnBonlGZYbJn9Bq6bJxVe+F3YKtzK7fDrbjgpnoWGTP61cHHex4hHMUBgCDesvQ3fc4b/x/40DxKZ7WZ318xI79o4l0TY2xku+5WbPv4RFiq8bOp/8oPfgF/y5bggjrNNP/OX+VNLBd5YedExesXM0BSzziPkX7YiYfF6sbVWgoZ44YqIVyRiuovvAFVNyeb2po/DnNMdPlfB/Bf3xjf+OJs+HWf2tnKm6yfvqfq9cGKLQynt+73+eXOjmhUOluFZqa8cgkPpS1Au1Ra3fLpP5gU04z6cJQD6ul8DBdOjclW/NaZJFY02PyztZWhHXJ/V+zvFzLqnoLtfeAvD0GcrFRLWap03D9S7p4W6hNpB7KsLYzvI/3HWIUl8zYjtF85gcdvTyu34qk4cSF8tpod1laZ4tHs9quhoLCveRqFgAAYWMBbv3mb2M6utttj4NbFfq38wmBZeqR72w==;5:+PTQtiULZU2pGC8HlAOdVrw93ybYfIFHqkLuKTDdUEXoz5fE1Ey/B0br5bqGYp3iX6Sab3I19Qw7491R9w695ZmDERDIfvJ0fw+HzN11SN4J/avX1y6KfcWZ0fwMBjjzpUN+SEfantnuVPg6Fv1W8ch9SO55CaOw4zMPReRYQTpzWo5Q/kCjHkmK1iI9mFOOD+HUCctM6orRuR7cnjURtQ==;7:WlHJ92m89I2dhQvIHyE0sM0pshPoahQEnfpqt5D33JfbwNv7SYqXS5yk/a/fUs9aOlpGsSZzIFSTky0y9TqLjisecVkuoOwmWV5XZsAS+0jr7mSOzh2a3jS6Fa2gxZDU8BYzKhd/PmEPv+tMA7gM5Q== x-ms-office365-filtering-correlation-id: a2487c71-2d54-4f5c-672f-08d688c3fb91 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1812; x-ms-traffictypediagnostic: BN6PR11MB1812: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(396003)(39860400002)(346002)(366004)(189003)(199004)(86362001)(72206003)(81156014)(8936002)(39060400002)(50226002)(105586002)(14454004)(107886003)(1076003)(36756003)(71200400001)(81166006)(71190400001)(66066001)(4326008)(478600001)(8676002)(25786009)(76176011)(2501003)(52116002)(99286004)(14444005)(256004)(110136005)(54906003)(68736007)(186003)(26005)(3846002)(6116002)(7416002)(386003)(6506007)(2616005)(11346002)(446003)(102836004)(6436002)(6486002)(476003)(7736002)(486006)(6512007)(97736004)(316002)(2906002)(305945005)(106356001)(53936002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1812;H:BN6PR11MB1842.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-message-info: e8OdQafwfE2nhl8DlNyXLV2Mm+JnESp+TemffGhhL+xbJkH4GglVEE9jurSlQq+yyPwY7e94ZtRjAteTtlB+pVuR0fCxNBarcc5qoeEEt+CNQQEyeMVGx07PW5wPow7b2RmdRs61Z/B6YkuZzSYBXCY3eHML3yfq2jSfL+D7pVd82/HstZbip2hofL7na2pRTyOR9wsgo36Ynfw2QWbKlaogLQSNbOmoaLYtrYETZXFFnQDOQx8+BPte/G3cmjPiQ5reuWlVaOKJSAzJmDaiMDSHB3i7h7b+6SM/xN7zUAVCkkoJgVqGguWCeB3CjwXIzMEnSxFvQcmUc/Z8E6Ai2MjCMcBNpVjxEZZMqxcJ7r1+dLolBHfJU4USfXnsZIEpLdH/Gsn7Oe7ExHZDlSemeBcEdZgfCr7/V1FiENXAuMk= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: a2487c71-2d54-4f5c-672f-08d688c3fb91 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:41.9667 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1812 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus The sam9x60 qspi controller uses 2 clocks, one for the peripheral register access, the other for the qspi core and phy. Both are mandatory. Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: "pclk" was made mandatory in previous patch. Reword clock descriptions. v2: - make "pclk" mandatory even for sama5d2. Unnamed clk will be supported in the driver. - drop unneeded example Documentation/devicetree/bindings/spi/atmel-quadspi.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/atmel-quadspi.txt b/Documentation/devicetree/bindings/spi/atmel-quadspi.txt index 1de54e87f5d6..fc7e83adab36 100644 --- a/Documentation/devicetree/bindings/spi/atmel-quadspi.txt +++ b/Documentation/devicetree/bindings/spi/atmel-quadspi.txt @@ -1,15 +1,19 @@ * Atmel Quad Serial Peripheral Interface (QSPI) Required properties: -- compatible: Should be "atmel,sama5d2-qspi". +- compatible: Should be one of the following: + - "atmel,sama5d2-qspi" + - "microchip,sam9x60-qspi" - reg: Should contain the locations and lengths of the base registers and the mapped memory. - reg-names: Should contain the resource reg names: - qspi_base: configuration register address space - qspi_mmap: memory mapped address space - interrupts: Should contain the interrupt for the device. -- clocks: The phandle of the clock needed by the QSPI controller. -- clock-names: Should contain "pclk" for the peripheral clock. +- clocks: Should reference the peripheral clock and the QSPI system + clock if available. +- clock-names: Should contain "pclk" for the peripheral clock and "qspick" + for the system clock when available. - #address-cells: Should be <1>. - #size-cells: Should be <0>. From patchwork Sat Feb 2 04:07:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 645D26C2 for ; Sat, 2 Feb 2019 04:08:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4591C3315C for ; Sat, 2 Feb 2019 04:08:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 325BA32D4A; Sat, 2 Feb 2019 04:08:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E034132D4A for ; Sat, 2 Feb 2019 04:08:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727906AbfBBEHz (ORCPT ); Fri, 1 Feb 2019 23:07:55 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:26407 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727877AbfBBEHw (ORCPT ); Fri, 1 Feb 2019 23:07:52 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="24146380" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:52 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.49) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VjxaQwIj/+IYFQkYFHMB2vafO284ePyLejTuUm87H1o=; b=TOmeCx1Zt+tKQ3OOtFIVC0EYJCwVEmNURU4Vc65jw6l8mlnHoXgr3N3vWKi59+GyJT6Dvwool+htvzZvIzyvMEZMWCQASCz/G8vVi6mHSmhHXungdwMwyrLMVgUZYW7dG5BGTuFcLH20wtEbUMAgVpgJXBx3nB/rIqSwP2ZT5NE= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1812.namprd11.prod.outlook.com (10.175.98.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:47 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:47 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 13/13] spi: atmel-quadspi: add support for sam9x60 qspi controller Thread-Topic: [PATCH v3 13/13] spi: atmel-quadspi: add support for sam9x60 qspi controller Thread-Index: AQHUuqzaAg1hhqTy/0qkkFhSooruSA== Date: Sat, 2 Feb 2019 04:07:46 +0000 Message-ID: <20190202040653.1217-14-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1812;6:aFj+GvzDPi0QxwQMK6dIP+WDNVw5/boU8MYV3QdKcBHyziCMCkaSIF/En2deZdK1lfh/rMzTK4rMgnpD6WduvtMOV/pnqPhPvBicikyfX/4Rf0q3zeznfid7dMD2RmvapuIwBThINr31i0PTjiGnwRmdEG+8EHBtvnw0JeUvgTrzH16GZmcdbQCrgLwCGeuijlyqAN7P5i8SoZZmV4ecE95hdQeYSxuh7Q6PThi/6q5FSWSvv5tejcQivgyvhYSg6vvPu6XYNIV+0MxU/Um0qAa0Ci627oTFbbNK5pLYKPeCeBPoH6Y41VOQxEVCGc199ZQtH2ZyJbDfp97MYDsoPxjXuqMMDXDJh+GBGT4GxX30eUjBtIpuIBN5eVKqWyyXVjADXhtqLymlLYNwolYPDTKaUiyQNP/gyy+IZD2L55jUe4FUQIVhTdclQrW4JtMgN3SP/Le2aewFWZkY6Dhr/Q==;5:pi8Csnriynjuw5TEW/7TIi9wLZY0AFWcdNC0rWqnlQ7chMasKPD2GaI2X4h+jHS9qLhlws/DVny80tdAyHFGQAwGlbprfjdqaXvl2U9Bk0d3IOntWZO0wXbZT8mBflGUL0xnTKstK3j3Ev8bgTgziwFfLQ+4EgejsVB0smOvE2X5Boca9qKFVxHrx0M9pFrFNPY7n2rTiz0Z7bBaNvrkKQ==;7:0sOquRucMpEWkh0pQ9S/074O5d1jTNvaJ5m6lYg1WqQfpMTF90iCbDNsDn40Ryh9DpvrVAImRWSrfFRCk3FpZnjyazioMSE1XZQ2qmgYcPAd1yrYInXZNUgdrE01o3sdK4ULYCOZCXxZ5vOEAQzgaQ== x-ms-office365-filtering-correlation-id: 3d9bd0a1-b122-44d2-396c-08d688c3fd2a x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1812; x-ms-traffictypediagnostic: BN6PR11MB1812: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(396003)(39860400002)(346002)(366004)(189003)(199004)(86362001)(72206003)(81156014)(8936002)(39060400002)(50226002)(105586002)(14454004)(107886003)(1076003)(36756003)(71200400001)(81166006)(71190400001)(66066001)(4326008)(478600001)(8676002)(25786009)(76176011)(2501003)(52116002)(99286004)(14444005)(256004)(110136005)(54906003)(68736007)(186003)(26005)(3846002)(6116002)(7416002)(386003)(6506007)(2616005)(11346002)(446003)(102836004)(6436002)(6486002)(476003)(7736002)(486006)(6512007)(97736004)(30864003)(316002)(53946003)(2906002)(305945005)(106356001)(53936002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1812;H:BN6PR11MB1842.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-message-info: cZttGz4Cc4ctPg9/IokC+7du/Yef65ZEc1pLRmoCuT3y0OjQYTu1L8m5IaMlaK001enT1OFcBaRd729Zb0bfMWFz5vkWfsYHysJan+Ys9Ge9enPuB4iuJs+Y97J4yjlX5mygtoQe5vjYBUEaFzuouEaCQk96YGUbkhVsHaKZqukkQV5KDYgpVleaKIthdWqO5Ou9Jhmgw7CjTXOj1+aoWRy+E3ipkQNunaIkU1dEL30KSy+MmK4VTjdX0nSpTD8fEWXKaLsFpsQapOaXdCCml2tExLFhGCEPRq54n4DZ+Gtq4+li86tvs0YlrlWfDdGM52EOPn3CRJykaHtzh+t1EH8lmHkjnR1nU93+01TpGc5m+FgJq2LMNF7Pk/tz9R8Pia/PlyNo7nfZRyiVR26mRORuld+SViMbJ+JEQBEvNY0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 3d9bd0a1-b122-44d2-396c-08d688c3fd2a X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:44.6489 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1812 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus The sam9x60 qspi controller uses 2 clocks, one for the peripheral register access, the other for the qspi core and phy. Both are mandatory. It uses different transfer type bits in IFR register. It has dedicated registers to specify a read or a write instruction: Read Instruction Code Register (RICR) and Write Instruction Code Register (WICR). ICR/RICR/WICR have identical fields. Tested with sst26vf064b jedec,spi-nor flash. Backward compatibility test done on sama5d2 qspi controller and mx25l25635e jedec,spi-nor flash. Signed-off-by: Tudor Ambarus --- v3: - reorganize the code and change ops functions pointers to avoid code duplication. From the IP perspective, the transfer type bits are different, and what registers are written: ricr/wicr instead of icr. - treat just regular spi transfers. Mem transfers will be added together with dirmap support. v2: - rework clock handling - reorder setting of register values in set_cfg() calls -> move functions that can fail in the upper part of the function body. drivers/spi/atmel-quadspi.c | 295 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 234 insertions(+), 61 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index c9548942535a..af1e4e25097a 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -35,7 +36,9 @@ #define QSPI_IAR 0x0030 /* Instruction Address Register */ #define QSPI_ICR 0x0034 /* Instruction Code Register */ +#define QSPI_WICR 0x0034 /* Write Instruction Code Register */ #define QSPI_IFR 0x0038 /* Instruction Frame Register */ +#define QSPI_RICR 0x003C /* Read Instruction Code Register */ #define QSPI_SMR 0x0040 /* Scrambling Mode Register */ #define QSPI_SKR 0x0044 /* Scrambling Key Register */ @@ -88,7 +91,7 @@ #define QSPI_SCR_DLYBS_MASK GENMASK(23, 16) #define QSPI_SCR_DLYBS(n) (((n) << 16) & QSPI_SCR_DLYBS_MASK) -/* Bitfields in QSPI_ICR (Instruction Code Register) */ +/* Bitfields in QSPI_ICR (Read/Write Instruction Code Register) */ #define QSPI_ICR_INST_MASK GENMASK(7, 0) #define QSPI_ICR_INST(inst) (((inst) << 0) & QSPI_ICR_INST_MASK) #define QSPI_ICR_OPT_MASK GENMASK(23, 16) @@ -117,6 +120,7 @@ #define QSPI_IFR_CRM BIT(14) #define QSPI_IFR_NBDUM_MASK GENMASK(20, 16) #define QSPI_IFR_NBDUM(n) (((n) << 16) & QSPI_IFR_NBDUM_MASK) +#define QSPI_IFR_APBTFRTYP_READ BIT(24) /* Bitfields in QSPI_SMR (Scrambling Mode Register) */ #define QSPI_SMR_SCREN BIT(0) @@ -133,16 +137,39 @@ #define QSPI_WPSR_WPVSRC(src) (((src) << 8) & QSPI_WPSR_WPVSRC) +/* Describes register values. */ +struct atmel_qspi_cfg { + u32 icr; + u32 iar; + u32 ifr; +}; + +struct atmel_qspi_caps; + struct atmel_qspi { void __iomem *regs; void __iomem *mem; struct clk *pclk; + struct clk *qspick; struct platform_device *pdev; + const struct atmel_qspi_caps *caps; u32 pending; u32 smm; struct completion cmd_completion; }; +struct atmel_qspi_ops { + void (*set_tfrtyp)(const struct spi_mem_op *op, + struct atmel_qspi_cfg *cfg); + void (*write_regs)(void __iomem *base, const struct spi_mem_op *op, + const struct atmel_qspi_cfg *cfg); +}; + +struct atmel_qspi_caps { + const struct atmel_qspi_ops *ops; + bool has_qspick; +}; + struct atmel_qspi_mode { u8 cmd_buswidth; u8 addr_buswidth; @@ -200,30 +227,36 @@ static bool atmel_qspi_supports_op(struct spi_mem *mem, return true; } -static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) +static int atmel_qspi_set_mode(struct atmel_qspi_cfg *cfg, + const struct spi_mem_op *op) { - struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->master); - void __iomem *base = aq->regs; - int mode; - u32 dummy_cycles = 0; - u32 iar, icr, ifr, sr; - int err = 0; - - iar = 0; - icr = QSPI_ICR_INST(op->cmd.opcode); - ifr = QSPI_IFR_INSTEN; + int mode = atmel_qspi_find_mode(op); - /* Set the QSPI controller in Serial Memory Mode */ - if (aq->smm != QSPI_MR_SMM) { - writel_relaxed(QSPI_MR_SMM, base + QSPI_MR); - aq->smm = QSPI_MR_SMM; - } - - mode = atmel_qspi_find_mode(op); if (mode < 0) return mode; + cfg->ifr = sama5d2_qspi_modes[mode].config; + return 0; +} - ifr |= sama5d2_qspi_modes[mode].config; +/* + * atmel_qspi_set_address_mode() - set address mode. + * @cfg: contains register values + * @op: describes a SPI memory operation + * + * The controller allows 24 and 32-bit addressing while NAND-flash requires + * 16-bit long. Handling 8-bit long addresses is done using the option field. + * For the 16-bit addresses, the workaround depends of the number of requested + * dummy bits. If there are 8 or more dummy cycles, the address is shifted and + * sent with the first dummy byte. Otherwise opcode is disabled and the first + * byte of the address contains the command opcode (works only if the opcode and + * address use the same buswidth). The limitation is when the 16-bit address is + * used without enough dummy cycles and the opcode is using a different buswidth + * than the address. + */ +static int atmel_qspi_set_address_mode(struct atmel_qspi_cfg *cfg, + const struct spi_mem_op *op) +{ + u32 dummy_cycles = 0; if (op->dummy.buswidth && op->dummy.nbytes) dummy_cycles = op->dummy.nbytes * 8 / op->dummy.buswidth; @@ -233,28 +266,28 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) case 0: break; case 1: - ifr |= QSPI_IFR_OPTEN | QSPI_IFR_OPTL_8BIT; - icr |= QSPI_ICR_OPT(op->addr.val & 0xff); + cfg->ifr |= QSPI_IFR_OPTEN | QSPI_IFR_OPTL_8BIT; + cfg->icr = QSPI_ICR_OPT(op->addr.val & 0xff); break; case 2: if (dummy_cycles < 8 / op->addr.buswidth) { - ifr &= ~QSPI_IFR_INSTEN; - ifr |= QSPI_IFR_ADDREN; - iar = (op->cmd.opcode << 16) | - (op->addr.val & 0xffff); + cfg->ifr &= ~QSPI_IFR_INSTEN; + cfg->ifr |= QSPI_IFR_ADDREN; + cfg->iar = (op->cmd.opcode << 16) | + (op->addr.val & 0xffff); } else { - ifr |= QSPI_IFR_ADDREN; - iar = (op->addr.val << 8) & 0xffffff; + cfg->ifr |= QSPI_IFR_ADDREN; + cfg->iar = (op->addr.val << 8) & 0xffffff; dummy_cycles -= 8 / op->addr.buswidth; } break; case 3: - ifr |= QSPI_IFR_ADDREN; - iar = op->addr.val & 0xffffff; + cfg->ifr |= QSPI_IFR_ADDREN; + cfg->iar = op->addr.val & 0xffffff; break; case 4: - ifr |= QSPI_IFR_ADDREN | QSPI_IFR_ADDRL; - iar = op->addr.val & 0x7ffffff; + cfg->ifr |= QSPI_IFR_ADDREN | QSPI_IFR_ADDRL; + cfg->iar = op->addr.val & 0x7ffffff; break; default: return -ENOTSUPP; @@ -263,22 +296,99 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) /* Set number of dummy cycles */ if (dummy_cycles) - ifr |= QSPI_IFR_NBDUM(dummy_cycles); + cfg->ifr |= QSPI_IFR_NBDUM(dummy_cycles); - /* Set data enable */ - if (op->data.nbytes) - ifr |= QSPI_IFR_DATAEN; + return 0; +} +static void atmel_qspi_sama5d2_set_tfrtyp(const struct spi_mem_op *op, + struct atmel_qspi_cfg *cfg) +{ if (op->data.dir == SPI_MEM_DATA_OUT) - ifr |= QSPI_IFR_SAMA5D2_WRITE_TRSFR; + cfg->ifr |= QSPI_IFR_SAMA5D2_WRITE_TRSFR; +} +static void atmel_qspi_sama5d2_write_regs(void __iomem *base, + const struct spi_mem_op *op, + const struct atmel_qspi_cfg *cfg) +{ /* Clear pending interrupts */ (void)readl_relaxed(base + QSPI_SR); /* Set QSPI Instruction Frame registers */ - writel_relaxed(iar, base + QSPI_IAR); - writel_relaxed(icr, base + QSPI_ICR); - writel_relaxed(ifr, base + QSPI_IFR); + writel_relaxed(cfg->iar, base + QSPI_IAR); + writel_relaxed(cfg->icr, base + QSPI_ICR); + writel_relaxed(cfg->ifr, base + QSPI_IFR); +} + +static void atmel_qspi_sam9x60_set_tfrtyp(const struct spi_mem_op *op, + struct atmel_qspi_cfg *cfg) +{ + if (!op->addr.nbytes && op->data.dir == SPI_MEM_DATA_IN) + cfg->ifr |= QSPI_IFR_APBTFRTYP_READ; +} + +static void atmel_qspi_sam9x60_write_regs(void __iomem *base, + const struct spi_mem_op *op, + const struct atmel_qspi_cfg *cfg) +{ + /* Clear pending interrupts */ + (void)readl_relaxed(base + QSPI_SR); + + /* Set QSPI Instruction Frame registers */ + writel_relaxed(cfg->iar, base + QSPI_IAR); + if (op->data.dir == SPI_MEM_DATA_IN) + writel_relaxed(cfg->icr, base + QSPI_RICR); + else + writel_relaxed(cfg->icr, base + QSPI_ICR); + writel_relaxed(cfg->ifr, base + QSPI_IFR); +} + +static int atmel_qspi_set_cfg(struct atmel_qspi *aq, + const struct spi_mem_op *op, + struct atmel_qspi_cfg *cfg) +{ + void __iomem *base = aq->regs; + int ret; + + /* Set the QSPI controller in Serial Memory Mode */ + if (aq->smm != QSPI_MR_SMM) { + writel_relaxed(QSPI_MR_SMM, base + QSPI_MR); + aq->smm = QSPI_MR_SMM; + } + + ret = atmel_qspi_set_mode(cfg, op); + if (ret) + return ret; + + ret = atmel_qspi_set_address_mode(cfg, op); + if (ret) + return ret; + + cfg->ifr |= QSPI_IFR_INSTEN; + cfg->icr |= QSPI_ICR_INST(op->cmd.opcode); + + /* Set data enable */ + if (op->data.nbytes) + cfg->ifr |= QSPI_IFR_DATAEN; + + aq->caps->ops->set_tfrtyp(op, cfg); + aq->caps->ops->write_regs(base, op, cfg); + + return 0; +} + +static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) +{ + struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->master); + void __iomem *base = aq->regs; + struct atmel_qspi_cfg cfg = {0}; + u32 sr; + int err; + + err = atmel_qspi_set_cfg(aq, op, &cfg); + if (err) + return err; /* Skip to the final steps if there is no data */ if (op->data.nbytes) { @@ -287,11 +397,11 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) /* Send/Receive data */ if (op->data.dir == SPI_MEM_DATA_IN) - _memcpy_fromio(op->data.buf.in, - aq->mem + iar, op->data.nbytes); + _memcpy_fromio(op->data.buf.in, aq->mem + cfg.iar, + op->data.nbytes); else - _memcpy_toio(aq->mem + iar, - op->data.buf.out, op->data.nbytes); + _memcpy_toio(aq->mem + cfg.iar, op->data.buf.out, + op->data.nbytes); /* Release the chip-select */ writel_relaxed(QSPI_CR_LASTXFER, base + QSPI_CR); @@ -391,9 +501,22 @@ static int atmel_qspi_probe(struct platform_device *pdev) struct spi_controller *ctrl; struct atmel_qspi *aq; struct resource *res; + const struct atmel_qspi_caps *caps; + struct device *dev = &pdev->dev; int irq, err = 0; - ctrl = spi_alloc_master(&pdev->dev, sizeof(*aq)); + caps = of_device_get_match_data(dev); + if (!caps) { + dev_err(dev, "Could not retrieve QSPI caps\n"); + return -EINVAL; + } + + if (!caps->ops->set_tfrtyp || !caps->ops->write_regs) { + dev_err(dev, "Could not retrieve QSPI ops\n"); + return -EINVAL; + } + + ctrl = spi_alloc_master(dev, sizeof(*aq)); if (!ctrl) return -ENOMEM; @@ -409,32 +532,33 @@ static int atmel_qspi_probe(struct platform_device *pdev) init_completion(&aq->cmd_completion); aq->pdev = pdev; + aq->caps = caps; /* Map the registers */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_base"); - aq->regs = devm_ioremap_resource(&pdev->dev, res); + aq->regs = devm_ioremap_resource(dev, res); if (IS_ERR(aq->regs)) { - dev_err(&pdev->dev, "missing registers\n"); + dev_err(dev, "missing registers\n"); err = PTR_ERR(aq->regs); goto exit; } /* Map the AHB memory */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap"); - aq->mem = devm_ioremap_resource(&pdev->dev, res); + aq->mem = devm_ioremap_resource(dev, res); if (IS_ERR(aq->mem)) { - dev_err(&pdev->dev, "missing AHB memory\n"); + dev_err(dev, "missing AHB memory\n"); err = PTR_ERR(aq->mem); goto exit; } /* Get the peripheral clock */ - aq->pclk = devm_clk_get(&pdev->dev, "pclk"); + aq->pclk = devm_clk_get(dev, "pclk"); if (IS_ERR(aq->pclk)) - aq->pclk = devm_clk_get(&pdev->dev, NULL); + aq->pclk = devm_clk_get(dev, NULL); if (IS_ERR(aq->pclk)) { - dev_err(&pdev->dev, "missing peripheral clock\n"); + dev_err(dev, "missing peripheral clock\n"); err = PTR_ERR(aq->pclk); goto exit; } @@ -442,32 +566,52 @@ static int atmel_qspi_probe(struct platform_device *pdev) /* Enable the peripheral clock */ err = clk_prepare_enable(aq->pclk); if (err) { - dev_err(&pdev->dev, "failed to enable the peripheral clock\n"); + dev_err(dev, "failed to enable the peripheral clock\n"); goto exit; } + if (caps->has_qspick) { + /* Get the QSPI system clock */ + aq->qspick = devm_clk_get(dev, "qspick"); + if (IS_ERR(aq->qspick)) { + dev_err(dev, "missing system clock\n"); + err = PTR_ERR(aq->qspick); + goto disable_pclk; + } + + /* Enable the QSPI system clock */ + err = clk_prepare_enable(aq->qspick); + if (err) { + dev_err(dev, + "failed to enable the QSPI system clock\n"); + goto disable_pclk; + } + } + /* Request the IRQ */ irq = platform_get_irq(pdev, 0); if (irq < 0) { - dev_err(&pdev->dev, "missing IRQ\n"); + dev_err(dev, "missing IRQ\n"); err = irq; - goto disable_pclk; + goto disable_qspick; } - err = devm_request_irq(&pdev->dev, irq, atmel_qspi_interrupt, - 0, dev_name(&pdev->dev), aq); + err = devm_request_irq(dev, irq, atmel_qspi_interrupt, 0, + dev_name(dev), aq); if (err) - goto disable_pclk; + goto disable_qspick; err = atmel_qspi_init(aq); if (err) - goto disable_pclk; + goto disable_qspick; err = spi_register_controller(ctrl); if (err) - goto disable_pclk; + goto disable_qspick; return 0; +disable_qspick: + clk_disable_unprepare(aq->qspick); disable_pclk: clk_disable_unprepare(aq->pclk); exit: @@ -483,6 +627,7 @@ static int atmel_qspi_remove(struct platform_device *pdev) spi_unregister_controller(ctrl); writel_relaxed(QSPI_CR_QSPIDIS, aq->regs + QSPI_CR); + clk_disable_unprepare(aq->qspick); clk_disable_unprepare(aq->pclk); return 0; } @@ -491,6 +636,7 @@ static int __maybe_unused atmel_qspi_suspend(struct device *dev) { struct atmel_qspi *aq = dev_get_drvdata(dev); + clk_disable_unprepare(aq->qspick); clk_disable_unprepare(aq->pclk); return 0; @@ -501,6 +647,7 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) struct atmel_qspi *aq = dev_get_drvdata(dev); clk_prepare_enable(aq->pclk); + clk_prepare_enable(aq->qspick); return atmel_qspi_init(aq); } @@ -508,8 +655,34 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(atmel_qspi_pm_ops, atmel_qspi_suspend, atmel_qspi_resume); +static const struct atmel_qspi_ops atmel_sama5d2_qspi_ops = { + .set_tfrtyp = atmel_qspi_sama5d2_set_tfrtyp, + .write_regs = atmel_qspi_sama5d2_write_regs, +}; + +static const struct atmel_qspi_caps atmel_sama5d2_qspi_caps = { + .ops = &atmel_sama5d2_qspi_ops, +}; + +static const struct atmel_qspi_ops atmel_sam9x60_qspi_ops = { + .set_tfrtyp = atmel_qspi_sam9x60_set_tfrtyp, + .write_regs = atmel_qspi_sam9x60_write_regs, +}; + +static const struct atmel_qspi_caps atmel_sam9x60_qspi_caps = { + .ops = &atmel_sam9x60_qspi_ops, + .has_qspick = true, +}; + static const struct of_device_id atmel_qspi_dt_ids[] = { - { .compatible = "atmel,sama5d2-qspi" }, + { + .compatible = "atmel,sama5d2-qspi", + .data = &atmel_sama5d2_qspi_caps, + }, + { + .compatible = "microchip,sam9x60-qspi", + .data = &atmel_sam9x60_qspi_caps, + }, { /* sentinel */ } };