From patchwork Mon Nov 5 11:14:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10667815 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 C8B491709 for ; Mon, 5 Nov 2018 11:15:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3F362919E for ; Mon, 5 Nov 2018 11:15:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A2F6329556; Mon, 5 Nov 2018 11:15: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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 134CE2919E for ; Mon, 5 Nov 2018 11:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+pfKwzvl7rL9NTYgagWE9028cR8HLnqk8PLCEl+79W8=; b=l4DyxkyH/ZcQYH /4Isi9kBoKtYb5H7fdPu7rE0cNLmQpn8Aq+4jC7cFdHu04RUQgrhnnOoVUsf6eo9rcqxIqroL/FNj ic6aszSikky8CbuGSJXBAFZxxJXQAOCaj2w9Mc4YqZMCA2nH1iJw69ur0ez0Y297bx9ESPcNgji8x UdnRoNUDiCyagh064yHSLz2aQBirazQJkJoDJZ+8BDdNP0EsaHVlsOvAvsXPdhsXuSdl6dL8fGPj7 0USqLCvyxjOrKvs4fjzXvhv6s0rCGRo5w0+i+HrIxdZqDdUsucTs7Il67SrdTCkV2nE1IFHJMkjOz ztAZd6Tz9TjFGrjxJ+kQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcqR-0005v3-Ib; Mon, 05 Nov 2018 11:14:59 +0000 Received: from esa1.microchip.iphmx.com ([68.232.147.91]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcq5-0005UN-VZ for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2018 11:14:39 +0000 X-IronPort-AV: E=Sophos;i="5.54,467,1534834800"; d="scan'208";a="23617408" 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; 05 Nov 2018 04:14:25 -0700 Received: from NAM03-BY2-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; Mon, 5 Nov 2018 04:14:25 -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=PtW5Ne5FbgerYWxnSAGvOvBx/UIH2D+oUYimY67ADd4=; b=fX9IIhMXmH2a3WTmBbow/IjjLxFyFZnYQU95iKROjqUH95fO8HGXKZ9szkeWurCr5mHCuQ9YKnvyYzqDpDScWNTtLA//090OuQy006gkaie5R9vnLuMmNTh8Kj/mbWa1aY8c5jIxuBgs/74K1m7tbgX+Qi1IjoC+vETU37gTFJc= Received: from BY2PR11MB0744.namprd11.prod.outlook.com (10.163.112.142) by BY2PR11MB0630.namprd11.prod.outlook.com (10.163.159.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Mon, 5 Nov 2018 11:14:24 +0000 Received: from BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8]) by BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8%7]) with mapi id 15.20.1294.032; Mon, 5 Nov 2018 11:14:24 +0000 From: To: , , Subject: [PATCH 1/4] power: reset: at91-poweroff: use one poweroff function for at91-poweroff Thread-Topic: [PATCH 1/4] power: reset: at91-poweroff: use one poweroff function for at91-poweroff Thread-Index: AQHUdPi1lxBGMWHwnUWOeydr5fonWw== Date: Mon, 5 Nov 2018 11:14:23 +0000 Message-ID: <1541416443-4321-2-git-send-email-claudiu.beznea@microchip.com> References: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0064.eurprd04.prod.outlook.com (2603:10a6:802:2::35) To BY2PR11MB0744.namprd11.prod.outlook.com (2a01:111:e400:52de::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BY2PR11MB0630; 6:C+Lva8xp/AU7q3CFGFwji+k+ctvrJDcy7U0y5SaKVblSImYvTLU54wfuGpCiQJdGFhmMLO6RSYXJMJwHBMprm4ChFK2Y79JjdtFL7ba5FRIQk+CImy5n7sMdYwMefjh9WtZKxNRmJiZYe0OE7KL8WrqQ/EoxnnDYzCA5hXE1izDoCR3Hlh5esL+34l70Rxq7Khn4sfElvWHEVjf+FS85XZYqFEpFP7ne6ckYmCGT7buJUwQigcU2MMViGABDaaDlqXdGOVnx8mnG1Q1zbDrV6BDOYGXyeP6oUZY+EUSt9Qz4UqcJwAeSGyjWXlxiHOurG1lr8M0dy5JLNcagUWm+Rf7z2PyUTzNCZlL4obu3/fDd4EocpdtvIezlF9VQMkzLyrfVT5DSQGlWQBNaydZvcSXQNujmFX+/PkTPAqH5eu6AFKGtmDpcUlQvhMAALWkuXdf9wq+OP+3bwF6XZyY8QQ==; 5:Oujzp0xyBeo2zFnUE/gHtule87PU3nBDskzhIhtfIWc2TKTjtq+cnZcSGAjEgqDcx96mQInVYeVCL1X50poz8CHyunTdZ6wXwpLKAYUe05Ly2IoMKsEN7Pe1iBCXsO1m8HB/Qt7V0TWMPSPbgrvtVzHZ12dqAgkLjKP6C0L0yRY=; 7:OYZTzmrPh3ddvEs9sv+AnrfQRBaGZhMIOoFFKWJ+5crwRahLQKJzXk9ZZJ4ipKFPbft458eEga7yfaW0BhHwqSRIKotnlaZcjXsXlq6hIwdRFNo0d8mmvKhuHOSp5DtKIeUlkouqCa+Msc7J6P88rg== x-ms-office365-filtering-correlation-id: 7140facb-a940-435b-e3db-08d6430fd75f x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BY2PR11MB0630; x-ms-traffictypediagnostic: BY2PR11MB0630: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231382)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:BY2PR11MB0630; BCL:0; PCL:0; RULEID:; SRVR:BY2PR11MB0630; x-forefront-prvs: 08476BC6EF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(396003)(346002)(366004)(199004)(189003)(14454004)(486006)(102836004)(5660300001)(6506007)(6512007)(386003)(86362001)(53936002)(25786009)(72206003)(2616005)(476003)(186003)(478600001)(26005)(4326008)(36756003)(2900100001)(446003)(76176011)(11346002)(71200400001)(71190400001)(2501003)(105586002)(52116002)(97736004)(8936002)(8676002)(305945005)(81166006)(81156014)(68736007)(2906002)(6486002)(106356001)(66066001)(7736002)(6116002)(3846002)(6436002)(256004)(107886003)(316002)(54906003)(110136005)(99286004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR11MB0630; H:BY2PR11MB0744.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-microsoft-antispam-message-info: 2A0Sf9b3kUodafHP4GGnef5NlKs5FllxCLibXE706llKRXSaY5woLw23jWE/o/eT5PBF0d+WP3jAf9ww82wL1+eITOOC0OU/oUCCybCOknJXgHcDOmPmgvMWZ9+ygjWRziUxC5KmYBTEgFMPD8BxBYmZrmJWYD5YZBoGM3FW3yf4KOD8rJARWLwxMzEv1ZupYGrstXCB4ZC9Qjy8T3hEjzuAsGYaUFlyEhVuNaDbmt0RGCD5qUe7s01M3U4oKBmqUHQSC00iJf3FQD9h6WXJ7uj5f+b8wNTK/aPawlvlFEStpJfdeaTLMIHyteGBxdokdtgpn0VoREIO5lTLsvjvOuvSi78I7iAzdCs9AFPp1yc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7140facb-a940-435b-e3db-08d6430fd75f X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2018 11:14:23.8732 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR11MB0630 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181105_031438_024271_4B57B166 X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use only one poweroff function and adapt it to work for both scenarios (with LPDDR or not). The assignement of pm_power_off was moved at the end of probe after all initializations are OK. This patch adapt the idea from commit 4e018c1e9b05 ("power: reset: at91-poweroff: use only one poweroff function"). Signed-off-by: Claudiu Beznea --- drivers/power/reset/at91-poweroff.c | 49 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index fb2fc8f741a1..82533f4c72fc 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -76,11 +76,6 @@ static void __init at91_wakeup_status(struct platform_device *pdev) static void at91_poweroff(void) { - writel(AT91_SHDW_KEY | AT91_SHDW_SHDW, at91_shdwc_base + AT91_SHDW_CR); -} - -static void at91_lpddr_poweroff(void) -{ asm volatile( /* Align to cache lines */ ".balign 32\n\t" @@ -89,9 +84,11 @@ static void at91_lpddr_poweroff(void) " ldr r6, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t" /* Power down SDRAM0 */ + " tst %0, #0\n\t" + " beq 1f\n\t" " str %1, [%0, #" __stringify(AT91_DDRSDRC_LPR) "]\n\t" /* Shutdown CPU */ - " str %3, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t" + "1: str %3, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t" " b .\n\t" : @@ -177,34 +174,42 @@ static int __init at91_poweroff_probe(struct platform_device *pdev) if (pdev->dev.of_node) at91_poweroff_dt_set_wakeup_mode(pdev); - pm_power_off = at91_poweroff; - np = of_find_compatible_node(NULL, NULL, "atmel,sama5d3-ddramc"); - if (!np) - return 0; + if (np) { + mpddrc_base = of_iomap(np, 0); + of_node_put(np); - mpddrc_base = of_iomap(np, 0); - of_node_put(np); + if (!mpddrc_base) { + ret = -ENOMEM; + goto clk_disable; + } - if (!mpddrc_base) - return 0; + ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & + AT91_DDRSDRC_MD; + if (ddr_type != AT91_DDRSDRC_MD_LPDDR2 && + ddr_type != AT91_DDRSDRC_MD_LPDDR3) { + iounmap(mpddrc_base); + mpddrc_base = NULL; + } + } - ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & AT91_DDRSDRC_MD; - if ((ddr_type == AT91_DDRSDRC_MD_LPDDR2) || - (ddr_type == AT91_DDRSDRC_MD_LPDDR3)) - pm_power_off = at91_lpddr_poweroff; - else - iounmap(mpddrc_base); + pm_power_off = at91_poweroff; return 0; + +clk_disable: + clk_disable_unprepare(sclk); + return ret; } static int __exit at91_poweroff_remove(struct platform_device *pdev) { - if (pm_power_off == at91_poweroff || - pm_power_off == at91_lpddr_poweroff) + if (pm_power_off == at91_poweroff) pm_power_off = NULL; + if (mpddrc_base) + iounmap(mpddrc_base); + clk_disable_unprepare(sclk); return 0; From patchwork Mon Nov 5 11:14:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10667807 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 6968115A6 for ; Mon, 5 Nov 2018 11:14:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5533B2919E for ; Mon, 5 Nov 2018 11:14:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4858E29556; Mon, 5 Nov 2018 11:14:55 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B090B2919E for ; Mon, 5 Nov 2018 11:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WdcUCy/sDky8S58dVpot5+uzkPkklUc4HCKAEFmJajc=; b=B+TEIOyvJUClNG yhUnCB3OgILQFgLnf1bxQwgO6t3kxU+byLL+8QX2aN3zWgHXE50eqA3UBM17feRFUDGLk1D8UGljJ 6+vAqy4nkMwrB/vCJCWV+KWrZvO1bfTodjwpMarRIpKX4xb7pk7lGh2vIYpwTs7Jxm5KaF7hn5Xgo IFW/FBi8gEZJ8apgYxNptaSF7LGap/2GZ2Lwqe4mytxx7ysAv/JlUdxyJOzvl2sO97qZ9/qLhNWm9 O6v96P/p/cF39TUQCcazDLbQ85fqZ3B61uaSrYXJIfZXfAQ8fA/cWauHSUAqBBXobxEpaU8MP+Hjp FDgQa+68yh2b9lmfff8A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcqG-0005fg-AO; Mon, 05 Nov 2018 11:14:48 +0000 Received: from esa5.microchip.iphmx.com ([216.71.150.166]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcq3-0005UR-RH for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2018 11:14:38 +0000 X-IronPort-AV: E=Sophos;i="5.54,467,1534834800"; d="scan'208";a="20663186" 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; 05 Nov 2018 04:14:29 -0700 Received: from NAM03-BY2-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; Mon, 5 Nov 2018 04:14:27 -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=e+JUJTO53rYb9O143bSdfJq9Q30g+BsmInmuHssJtY8=; b=0hL3+GithIwePhw9c/iWkO4lbW6mDySIezO4isgBAUJ8Zx2LbvKFvyuasXTGWb9wwwxN8rdUAc4hqkEthW6hIzlTv4BvN1wYvpW2pVruSnxU6ST3vhjchEPKIX8NDxed3SQ2fFBVO/VPKLHy7a0kHal3augleYwEXQWSxvtKuW0= Received: from BY2PR11MB0744.namprd11.prod.outlook.com (10.163.112.142) by BY2PR11MB0630.namprd11.prod.outlook.com (10.163.159.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Mon, 5 Nov 2018 11:14:26 +0000 Received: from BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8]) by BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8%7]) with mapi id 15.20.1294.032; Mon, 5 Nov 2018 11:14:26 +0000 From: To: , , Subject: [PATCH 2/4] power: reset: at91-poweroff: move shdwc related data to one structure Thread-Topic: [PATCH 2/4] power: reset: at91-poweroff: move shdwc related data to one structure Thread-Index: AQHUdPi2R8S5SO7XUE65Fo0kFeM8lg== Date: Mon, 5 Nov 2018 11:14:26 +0000 Message-ID: <1541416443-4321-3-git-send-email-claudiu.beznea@microchip.com> References: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0064.eurprd04.prod.outlook.com (2603:10a6:802:2::35) To BY2PR11MB0744.namprd11.prod.outlook.com (2a01:111:e400:52de::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BY2PR11MB0630; 6:OxCOSNsScSj8sIC2nphFA6vcDgwrwL7/XbHOsgEWAFsH5FreCwq0dwkL+BIrGHrtEnXxaWuB/ZI/x6gInZ+mdVmG8XT1s2mHQQhjPzuqzguLxAuFQja/2QjQDF3+DefB/rWSYS1NJxDd163ylFGMqFqdb9oaF1vVlTDC+OUO5JWa+neUxefDyTPuyMLWAfOTPaXCXJCCpEqcMbSCTz32o/FgcOJK5n+PQ/Ck8sNfZ2FktSZrBMPsldCcq0C0aSl1kQh1fgZybGinuL/8bRzP91JMY72MBGbO8129plv8m9hgHkglNfiiE8ite+R1J0PF3/MIQo61XOhTyo2aTwPQbNHepLaIJBhK4OA0HBljUiu1H8HOkMg5JhsNEBsclsceKHlF7uFaMePlL9kpd3u3rCbyWjiYFrKCt/yLzPn9SDsWcRHXLEWTfypP0mXFK2W9BeD1ysXzigKtoNvO4n8x8g==; 5:2Jvg1BiQKnGEdUR56UPLnprhvcgA/o+9Qdv8n2E063hts8eSdG2pir6Udb4LHcX5OOnO2a7V/+8KstwJsp69u9jsUOZZZ9Qw0VNibWdVvY+surYoId2ph6FXySRmOodezh2O1g5vHJuIzZ1iyHF2bA2ujMuWiWVH3mNyrRfWEAI=; 7:WTkL/Vnt97BLD0eds7OrHSkKUFfFyIDBCtSCMbQTKyQApnY6a+c9w9Dobz4Idv6gjYIICpC75lUoKgGD48kYg5dlzATRPVv/2R5A+012Retw3sue+yH7oHYp2yBshiT0ASnY2WO73w545eUO1yny/w== x-ms-office365-filtering-correlation-id: a5358e31-8ee4-4cd3-d565-08d6430fd8b7 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BY2PR11MB0630; x-ms-traffictypediagnostic: BY2PR11MB0630: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231382)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:BY2PR11MB0630; BCL:0; PCL:0; RULEID:; SRVR:BY2PR11MB0630; x-forefront-prvs: 08476BC6EF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(396003)(346002)(366004)(199004)(189003)(14454004)(486006)(575784001)(102836004)(5660300001)(6506007)(6512007)(386003)(86362001)(53936002)(25786009)(72206003)(2616005)(476003)(186003)(478600001)(26005)(4326008)(36756003)(2900100001)(446003)(76176011)(11346002)(71200400001)(71190400001)(2501003)(105586002)(52116002)(97736004)(8936002)(8676002)(305945005)(81166006)(81156014)(68736007)(2906002)(6486002)(106356001)(66066001)(7736002)(6116002)(3846002)(6436002)(256004)(107886003)(316002)(54906003)(110136005)(99286004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR11MB0630; H:BY2PR11MB0744.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-microsoft-antispam-message-info: NaOG6omT+Zcx9Gzk/a3xI5GNynOG5r6SU0luF67gd+DXctzhCOjwR1NjkgsCHmsu6RrJ+NCjtOvZAmmdJ/SvQmNmiArwYaqlWx4e7roEEe0Hs8jxLDSs8eDfYPyV0pvReDcjJSJReDMSPI+ob/PDaBls31aoT8I9rowDBsr3AwFi6SNWxcVpmxws6anW3379EKM/FFjMWC6I/hRdFRos+9NbfjmhXIrdewqNQyeA8xm3HdhAdNQxFihGxV9HVSBsU1QzyPodQCFpvGO/m9Jj8b/s+kv05KDQtUEjjY/3ol+WVTMVeCoq5yDJXXxeH60ruRJhLRZB+I7wb7JtKiKrjmAXkl6j+GG6UdUsIi1IOpI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: a5358e31-8ee4-4cd3-d565-08d6430fd8b7 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2018 11:14:26.1532 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR11MB0630 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181105_031435_993148_6D37B2B4 X-CRM114-Status: GOOD ( 14.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move SHDWC realted data to only one structure to have them grouped. Inspired from commit 9be74f0d39c1 ("power: reset: at91-poweroff: make mpddrc_base part of struct shdwc"). Signed-off-by: Claudiu Beznea --- drivers/power/reset/at91-poweroff.c | 60 +++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index 82533f4c72fc..48661e04a3de 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -51,14 +51,19 @@ static const char *shdwc_wakeup_modes[] = { [AT91_SHDW_WKMODE0_ANYLEVEL] = "any", }; -static void __iomem *at91_shdwc_base; -static struct clk *sclk; -static void __iomem *mpddrc_base; +struct shdwc { + struct clk *sclk; + void __iomem *shdwc_base; + void __iomem *mpddrc_base; +}; + +static struct shdwc *at91_shdwc; static void __init at91_wakeup_status(struct platform_device *pdev) { + struct shdwc *shdwc = platform_get_drvdata(pdev); const char *reason; - u32 reg = readl(at91_shdwc_base + AT91_SHDW_SR); + u32 reg = readl(shdwc->shdwc_base + AT91_SHDW_SR); /* Simple power-on, just bail out */ if (!reg) @@ -92,9 +97,9 @@ static void at91_poweroff(void) " b .\n\t" : - : "r" (mpddrc_base), + : "r" (at91_shdwc->mpddrc_base), "r" cpu_to_le32(AT91_DDRSDRC_LPDDR2_PWOFF), - "r" (at91_shdwc_base), + "r" (at91_shdwc->shdwc_base), "r" cpu_to_le32(AT91_SHDW_KEY | AT91_SHDW_SHDW) : "r6"); } @@ -118,6 +123,7 @@ static int at91_poweroff_get_wakeup_mode(struct device_node *np) static void at91_poweroff_dt_set_wakeup_mode(struct platform_device *pdev) { + struct shdwc *shdwc = platform_get_drvdata(pdev); struct device_node *np = pdev->dev.of_node; int wakeup_mode; u32 mode = 0, tmp; @@ -144,7 +150,7 @@ static void at91_poweroff_dt_set_wakeup_mode(struct platform_device *pdev) if (of_property_read_bool(np, "atmel,wakeup-rtt-timer")) mode |= AT91_SHDW_RTTWKEN; - writel(wakeup_mode | mode, at91_shdwc_base + AT91_SHDW_MR); + writel(wakeup_mode | mode, shdwc->shdwc_base + AT91_SHDW_MR); } static int __init at91_poweroff_probe(struct platform_device *pdev) @@ -154,16 +160,22 @@ static int __init at91_poweroff_probe(struct platform_device *pdev) u32 ddr_type; int ret; + at91_shdwc = devm_kzalloc(&pdev->dev, sizeof(*at91_shdwc), GFP_KERNEL); + if (!at91_shdwc) + return -ENOMEM; + + platform_set_drvdata(pdev, at91_shdwc); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - at91_shdwc_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(at91_shdwc_base)) - return PTR_ERR(at91_shdwc_base); + at91_shdwc->shdwc_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(at91_shdwc->shdwc_base)) + return PTR_ERR(at91_shdwc->shdwc_base); - sclk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(sclk)) - return PTR_ERR(sclk); + at91_shdwc->sclk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(at91_shdwc->sclk)) + return PTR_ERR(at91_shdwc->sclk); - ret = clk_prepare_enable(sclk); + ret = clk_prepare_enable(at91_shdwc->sclk); if (ret) { dev_err(&pdev->dev, "Could not enable slow clock\n"); return ret; @@ -176,20 +188,20 @@ static int __init at91_poweroff_probe(struct platform_device *pdev) np = of_find_compatible_node(NULL, NULL, "atmel,sama5d3-ddramc"); if (np) { - mpddrc_base = of_iomap(np, 0); + at91_shdwc->mpddrc_base = of_iomap(np, 0); of_node_put(np); - if (!mpddrc_base) { + if (!at91_shdwc->mpddrc_base) { ret = -ENOMEM; goto clk_disable; } - ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & + ddr_type = readl(at91_shdwc->mpddrc_base + AT91_DDRSDRC_MDR) & AT91_DDRSDRC_MD; if (ddr_type != AT91_DDRSDRC_MD_LPDDR2 && ddr_type != AT91_DDRSDRC_MD_LPDDR3) { - iounmap(mpddrc_base); - mpddrc_base = NULL; + iounmap(at91_shdwc->mpddrc_base); + at91_shdwc->mpddrc_base = NULL; } } @@ -198,19 +210,21 @@ static int __init at91_poweroff_probe(struct platform_device *pdev) return 0; clk_disable: - clk_disable_unprepare(sclk); + clk_disable_unprepare(at91_shdwc->sclk); return ret; } static int __exit at91_poweroff_remove(struct platform_device *pdev) { + struct shdwc *shdwc = platform_get_drvdata(pdev); + if (pm_power_off == at91_poweroff) pm_power_off = NULL; - if (mpddrc_base) - iounmap(mpddrc_base); + if (shdwc->mpddrc_base) + iounmap(shdwc->mpddrc_base); - clk_disable_unprepare(sclk); + clk_disable_unprepare(shdwc->sclk); return 0; } From patchwork Mon Nov 5 11:14:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10667825 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 E66D41709 for ; Mon, 5 Nov 2018 11:15:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D375F2919E for ; Mon, 5 Nov 2018 11:15:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C762C29556; Mon, 5 Nov 2018 11:15:31 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5D9B02919E for ; Mon, 5 Nov 2018 11:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mK3MKOuE/K1tkDzNi4WC9eHupGod+ZPg8mSWdt7yO6I=; b=XwA61slpp5aXVc v6ugNG8iDW46J7qr5CXZfpoxOt6qUXActp2yqWtMO4B40oJb0ypPrNZhDpvIyy9kAv23+YpIWRiON ley+eSqYojp315N2enM6a6w6jd8RVUXBrHHED95/TPiwJZOsf6yznn8rkgBhLHITwl5RmO35tMyrG KSHccc247ZSJLF/zpmCtiIYnQ0pU7siCF25UupZSYwubzwZ3svNRpFT0ECKcZyEgaN39UDoff9G6n pd4OU5n5HN68WZVUz50SNIjxARO5BYtMdzcSSU6uepj0VqF3FHGGtz4oY9pKrB0uIwpBfsjXjf3Hq A9JaLf36GWdObkIUCqWQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcqv-0007is-FL; Mon, 05 Nov 2018 11:15:29 +0000 Received: from esa3.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcq9-0005Ul-OR for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2018 11:14:44 +0000 X-IronPort-AV: E=Sophos;i="5.54,467,1534834800"; d="scan'208";a="22824217" 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; 05 Nov 2018 04:14:30 -0700 Received: from NAM01-BY2-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; Mon, 5 Nov 2018 04:14:30 -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=oh/okI0n2t8fOleOgIm1xdXggcUktWVVRB6LkZufSsc=; b=C2bfItYjVPYj2JaobrzzGXP06I+fbeSWi3P88oCUK4Gpuyvjzvg82VUY3u7IQ6hkyYrOmPwhM+96J0+L8d+E/kj7n9zaYp3axNIB0m9akS3gJz1LxY4T6GBnPMJKm53E/uYBEAGpmJjk7sRFVoPRoDNfX6bN0xSQ5pOKqORH9K8= Received: from BY2PR11MB0744.namprd11.prod.outlook.com (10.163.112.142) by BY2PR11MB0647.namprd11.prod.outlook.com (10.163.159.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Mon, 5 Nov 2018 11:14:29 +0000 Received: from BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8]) by BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8%7]) with mapi id 15.20.1294.032; Mon, 5 Nov 2018 11:14:29 +0000 From: To: , , Subject: [PATCH 3/4] power: reset: at91-poweroff: check shdwc data structure at the beginning of probe Thread-Topic: [PATCH 3/4] power: reset: at91-poweroff: check shdwc data structure at the beginning of probe Thread-Index: AQHUdPi4+s+ozNW3FEOixfyfnTwbtw== Date: Mon, 5 Nov 2018 11:14:28 +0000 Message-ID: <1541416443-4321-4-git-send-email-claudiu.beznea@microchip.com> References: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0064.eurprd04.prod.outlook.com (2603:10a6:802:2::35) To BY2PR11MB0744.namprd11.prod.outlook.com (2a01:111:e400:52de::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BY2PR11MB0647; 6:NdNpTJ2AES7ZbvwkGDKNRTJ2y4xvRD/HvGspvgrFl9ClJkQ8bQ3at1aBVtyBxCwesl0uDnujTkr6rhIibixgXV2CsLdX416+rIf+yc4mhln0WOTtoTKoknXZA2XqmBTE2hKg9LfkNmw0qItrgFHTqL+HAooJ/HU1ZwKV9KlcwqztNQLecpKa5JaKHijzFxTJmfd+9g0eq4S3wd/agHXwHEC17tMEKH3/AyZG88K++JwRRX7AX0Bie3NcJZeHFdsftbm504qbNXhMXeE+mDosXfFvnvFKfQW0TY173r834JEnLRRcfFCVjBizUx4AAkIqdFd92SMAmo4GDLBimbD8c3C/illHhIsnzDrvlXcZ1KcZBs8MKDA7vV0sfcxPK9fmrkErvWSIUcA0a0RIZmYpR+Pqi5VYZR1XwECNL21etE5w0rLEoys1V10fzYOS7UsgQLRVG4iLpuiKgahSdteJTQ==; 5:60R3tMbzoXiJAS1VrevY332nZUT6u9XuofGyzhgKBLjXPD3vPYdmOP8T67l9k5eV1yo9r+agTULui1+jc1qv9UME69QeMz3Sz8VIxp7W4p+Kmo6E+StTuLc8K1sTMPthGWAwR6+0vIKGNYSsld3E8dws/5PIW8dsbRTNRGShN6w=; 7:gCkIJS8TzYE5VX/ip5BHpaX2D8L9b3x6lXPPpOSGCEKhy5pOw/WpHV8TcIkppdE8awSUWMmS405eaL4/y0jeur7gjrWtTt94L6fZK7+RvFb7g35yK8/Oe/z4jf/KYG2o6ZJPGIEird0adZSpWyx5NA== x-ms-office365-filtering-correlation-id: 983f6ac8-7593-4a4a-5490-08d6430fda42 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BY2PR11MB0647; x-ms-traffictypediagnostic: BY2PR11MB0647: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231382)(944501410)(52105095)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:BY2PR11MB0647; BCL:0; PCL:0; RULEID:; SRVR:BY2PR11MB0647; x-forefront-prvs: 08476BC6EF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39850400004)(396003)(136003)(366004)(189003)(199004)(54906003)(6486002)(72206003)(316002)(97736004)(110136005)(99286004)(2501003)(575784001)(86362001)(478600001)(6436002)(5660300001)(36756003)(8936002)(4326008)(66066001)(186003)(81156014)(106356001)(81166006)(8676002)(105586002)(305945005)(2906002)(25786009)(7736002)(68736007)(6116002)(11346002)(3846002)(76176011)(53936002)(26005)(102836004)(6506007)(386003)(486006)(2900100001)(6512007)(446003)(14454004)(2616005)(256004)(476003)(71200400001)(71190400001)(107886003)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR11MB0647; H:BY2PR11MB0744.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-microsoft-antispam-message-info: TfSvzhP7uuyViaNsw+6tn1jtsAdDuPiWwD6D2i6BoxkUtZyamTNJ1ZJ/JQp7ZgIDRV9YovCf0yXwZUb7JD2FGg7P9RGxwpp+7mCI2h498M6M3SLQ6elf0EjNnDSm26iLHK6kqmYDXWfZK6WaD361mzwRz78L+GXEU98Z0knp2fueo9sCYAwm7Xmu5NZtIp/cv7fksisfVLJcSW3/hKDXb+3pHQ7pmi1l/vi4f+TBd1/H8tj1oV0zLsGPcS9ggk1LTwilQkwjJSIymRCkCmUYOdeZNZv8Hewfm5pMZ5LrQzn+mP9Ble8nrd4ajh7dZhMogsa8zxBTdu1iCjJgsX63s7nUXMul2ZRAWd36dKdP3QE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 983f6ac8-7593-4a4a-5490-08d6430fda42 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2018 11:14:28.9118 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR11MB0647 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181105_031442_029607_4A386EA2 X-CRM114-Status: GOOD ( 10.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Check at91_shdwc before continuing with probe since we want only one instance of this driver. Inspired from commit 9f1e44774be5 ("power: reset: at91-poweroff: do not procede if at91_shdwc is allocated"). Signed-off-by: Claudiu Beznea --- drivers/power/reset/at91-poweroff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index 48661e04a3de..e75d8f0f0526 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -160,6 +160,9 @@ static int __init at91_poweroff_probe(struct platform_device *pdev) u32 ddr_type; int ret; + if (at91_shdwc) + return -EBUSY; + at91_shdwc = devm_kzalloc(&pdev->dev, sizeof(*at91_shdwc), GFP_KERNEL); if (!at91_shdwc) return -ENOMEM; From patchwork Mon Nov 5 11:14:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10667823 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 D75011709 for ; Mon, 5 Nov 2018 11:15:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C488E2919E for ; Mon, 5 Nov 2018 11:15:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8A3129556; Mon, 5 Nov 2018 11:15:19 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6DE9E2919E for ; Mon, 5 Nov 2018 11:15:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7sOAQUIkI3iwOgS/CGY+sW98I3/arGnA6ZSMoZRq/pY=; b=g1881WkWAZm6wr o7eI3hozJpKBnvdd+k9DMOe46JsTP1wosDp8eOg5ZTMWVeCZKYhiRYaMHg61GEaG2FZg6FRVddbNY lEpz/ZYU1ha2j6/CHr0GZMe17CtIPIAR9FvDNcFfuDN5YkMqlq0kYEKUYqg1OWrMLDCYGlxLv3Aoz cdAdkBKDEgI632W0Kd7aRErXL7+BPEcpGudvmf/sFETIdDVBZtE2soUitB3LAfSRoQIiHZFHmbBsJ xx+jy4M7RngQuXxgvSmRdu5phYWawgvPL5YtpLy88FRx6F0Zf8hebTtDP9RVy+RlYNFUQNOH8jtGV bAw5VQgQRPxCVVxO6U9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcqk-0007Uy-41; Mon, 05 Nov 2018 11:15:18 +0000 Received: from esa1.microchip.iphmx.com ([68.232.147.91]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJcq5-0005Um-VZ for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2018 11:14:39 +0000 X-IronPort-AV: E=Sophos;i="5.54,467,1534834800"; d="scan'208";a="23617414" 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; 05 Nov 2018 04:14:32 -0700 Received: from NAM01-BY2-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; Mon, 5 Nov 2018 04:14: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=9/c3VK6Ys11Vot9KDM5zrjLWbm6LGnqDD11Vxceug/U=; b=BmTmIzuDqlNAmcRSFh8/IWje9JC0uB/Klu3BBctajfPD2pK3RbLCXgaT/DbhTkSwlyBQHLhO/QE7KNoA5FeqzuX8qbYMlzbC9D8boZbdOUpzjGDjyiJMpM/IYbR80efC0zxwrcWImM2ZTCJxY1voMb4b/TEgiYajWgiyI1h9Uas= Received: from BY2PR11MB0744.namprd11.prod.outlook.com (10.163.112.142) by BY2PR11MB0647.namprd11.prod.outlook.com (10.163.159.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Mon, 5 Nov 2018 11:14:31 +0000 Received: from BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8]) by BY2PR11MB0744.namprd11.prod.outlook.com ([fe80::d0a5:29e0:506a:76a8%7]) with mapi id 15.20.1294.032; Mon, 5 Nov 2018 11:14:31 +0000 From: To: , , Subject: [PATCH 4/4] power: reset: at91-poweroff: remove at91_ramc_of_match Thread-Topic: [PATCH 4/4] power: reset: at91-poweroff: remove at91_ramc_of_match Thread-Index: AQHUdPi5lHUuequYaEebxLWNIuZPVQ== Date: Mon, 5 Nov 2018 11:14:31 +0000 Message-ID: <1541416443-4321-5-git-send-email-claudiu.beznea@microchip.com> References: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1541416443-4321-1-git-send-email-claudiu.beznea@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0064.eurprd04.prod.outlook.com (2603:10a6:802:2::35) To BY2PR11MB0744.namprd11.prod.outlook.com (2a01:111:e400:52de::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BY2PR11MB0647; 6:6v95w7LMfJ+JX/fA5R6AggineOcNuaw7+YaRnu1LxBIBRaxKBgYEGDpX+m/HixWqNAHcaS5IklyaSn6VIc366kmhaqLeqP78hbGSF8KqLstJqNAcli5BvpGi/c/TvpeclE9B1amz4frC2X6Y53dChGu57fX48aYQ61uYR+x6wQMz7fVZcnvQbwDPcAeCZPqWik/LfnMOppeQ/rLOnxMXlWsq6muI/m6gUIxWFDiECTKM++yLZPAeTikrjn4jIY+JjY8uOryguZUB0cbRW7O/ttxpWr4qB9W6AmyjtAPaYVRtCkOLfMfRTy+hN6Qr1NMO4LVlqI3sRath2l4icglcY1o1M7hcJ5R4uqrZzvlqlCQZcq23uUAtgIAh8woRU54zCGpnux9p1wxZRHBo2gxpqyIDapzFcJylIak2U9H6KbuywRZLBuI7dcorsgv8ff5VlJ3CQIABN8uAsJzNYEzAzg==; 5:LqRzj85Z+600jYRBl/9aaur5U0gmTpIC4IZbqod+n12ZpwvZTSlibgE06ooT11CFiqqjDFFMSjcCgdJ/Ej+Og/nwaNxexxL02XdaB2FDDgfDziURtHE3ZgKsV/gh51oYBhDQZPxeCwvgui8PLcha/kR4fLY7I83u76OkGaJLylE=; 7:tgTTjPISrUQU15jyBKwH6yCq0EcbAhIj1TWU+UDD7kfhRfrTbL8fcv1FpxFH9B7hLmOXE9QQ/e4S82gfw4s8ZkRTFTXj/r06jj5Gp4Q1omkgOs3JSyzlEC2OL/CmYLiJGpICiWz+US+UuGvjmYqf+A== x-ms-office365-filtering-correlation-id: c5a46f57-9b42-4e57-fbb6-08d6430fdbc1 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BY2PR11MB0647; x-ms-traffictypediagnostic: BY2PR11MB0647: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231382)(944501410)(52105095)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:BY2PR11MB0647; BCL:0; PCL:0; RULEID:; SRVR:BY2PR11MB0647; x-forefront-prvs: 08476BC6EF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(376002)(346002)(39850400004)(396003)(136003)(366004)(189003)(199004)(54906003)(6486002)(72206003)(316002)(97736004)(110136005)(99286004)(2501003)(575784001)(86362001)(478600001)(6436002)(5660300001)(36756003)(8936002)(4326008)(66066001)(186003)(81156014)(106356001)(81166006)(8676002)(105586002)(305945005)(2906002)(25786009)(7736002)(68736007)(6116002)(11346002)(3846002)(76176011)(53936002)(26005)(102836004)(6506007)(386003)(486006)(2900100001)(6512007)(446003)(14454004)(2616005)(256004)(476003)(71200400001)(71190400001)(107886003)(52116002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR11MB0647; H:BY2PR11MB0744.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-microsoft-antispam-message-info: cuBm1hqspDShEUG6kyXh8Y6OlcZ9C14gyA4cvzDPrxq7B+ahPxEaDLuwjvbkllqcejBpFANpcv9pxoHWa43tjG2K3Hu78pA7u2WHQ3xz+qEP9mvSyfXcZ3fvkF9x1xTbTorxKfGS1SxuP+W4cqPVrgp2kUdVJhqyeN1vu/M4zSKIASdqqc83dQuu1G7uCpahAmJfADi20QYJIeDcKDVzA0lAWQE4Q9M3Onc56CPEIdAp+dbGMqb1+F6X8vsZkavvhczZ15oXMsq0TQPRn8I+Z+/lwo5fYxC53kzvftTso7c81BoVdYIIM4O0TyXu+9vr1yvQJq+apEERWi68r8wCxZw+E3oo4sQVJ6ibKc3iJJ4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: c5a46f57-9b42-4e57-fbb6-08d6430fdbc1 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2018 11:14:31.3640 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR11MB0647 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181105_031438_022188_F0BD7A06 X-CRM114-Status: GOOD ( 10.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Remove at91_ramc_of_match[] since it is not used anywhere in this code. Signed-off-by: Claudiu Beznea --- drivers/power/reset/at91-poweroff.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index e75d8f0f0526..43b4cccb7d0c 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -232,11 +232,6 @@ static int __exit at91_poweroff_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id at91_ramc_of_match[] = { - { .compatible = "atmel,sama5d3-ddramc", }, - { /* sentinel */ } -}; - static const struct of_device_id at91_poweroff_of_match[] = { { .compatible = "atmel,at91sam9260-shdwc", }, { .compatible = "atmel,at91sam9rl-shdwc", },