From patchwork Thu Feb 14 15:54:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813089 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 C5B5117D5 for ; Thu, 14 Feb 2019 15:55:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEAAD2EB41 for ; Thu, 14 Feb 2019 15:55:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A2A062EC86; Thu, 14 Feb 2019 15:55:28 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 C74032EB41 for ; Thu, 14 Feb 2019 15:55:27 +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=Zt0oL7rzPSyylA1NyY160Q+umfXRp4Sm3SShpZW4lgE=; b=RI/UZvhPosM/Dy eXbM2HaiacQfLSVNFdaslRzx3c86+1khk6pX+wt+q8NP0/AoXb5TgG2nXOWyroAKgfSPslVvRd+ZN uDRTlRemifWD/ja7b+Y3VJNfyoFfCt6z+QJObd+lE0jZjHg2h+KIfZwMJH/Y1HJ/Qu5af9mfmo2m+ eRCjua0cK1w4hyVJGrvnAUMoWCTT8S5Qr5t8EEPU22M0tDuJlXEDyTvbEvNLyFOIoJEbzBgGCTndI rqBsby8lsHPke2s6SzTR4S5U+Op0+46jbi3mEP8tNaPsWM96zHIKjSjJsBtLHtDDOa82HSUUSwMaC 40TAr7eKbov2uCk6AX8Q==; 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 1guJM9-0007PR-GG; Thu, 14 Feb 2019 15:55:21 +0000 Received: from esa6.microchip.iphmx.com ([216.71.154.253]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJLk-0005mD-Tz for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:54:59 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="23863282" 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; 14 Feb 2019 08:54:37 -0700 Received: from NAM02-CY1-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; Thu, 14 Feb 2019 08:54:33 -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=bXl5rR4aFPv3PsriLRaht8E8JlyDTEeGsJ+rsKPmwA8=; b=Y3+476ZK67vZi020499eJgccS0t6LOdFK276iCFn0zQ8oA7W28NoUJqNnkvfOT5S1tTMC2WDH9n5N/SOk8O8+vNIXeuUH9iTJjuF3E/cvTWLcXJNoe4BnH0QPatU+QqDvncvVxkGGO7K3FTEwwoDFIS2qAjfTnl9AEOsa88NNwQ= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB2031.namprd11.prod.outlook.com (10.169.236.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.17; Thu, 14 Feb 2019 15:54:31 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:54:31 +0000 From: To: , , , , , , , Subject: [PATCH 1/8] ARM: at91: pm: introduce at91_soc_pm structure Thread-Topic: [PATCH 1/8] ARM: at91: pm: introduce at91_soc_pm structure Thread-Index: AQHUxH2TDCqaNyQ5LkC7OjYQ/CzNzw== Date: Thu, 14 Feb 2019 15:54:31 +0000 Message-ID: <1550159642-26878-2-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b4bd4073-cbbd-40d0-18e2-08d69294b51b x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB2031; x-ms-traffictypediagnostic: MWHPR11MB2031: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB2031; 23:F77TLxi1QRSvcsGFNSEpR/S3f/h2RNmTn0Kq8aN?= =?iso-8859-1?q?1+Q8qtd7Q+hAVPE?= =?iso-8859-1?q?Hri4/ZvOM/6/qKEJ+B+WixHTRmrq5R8tffKr4Tp5fEMUftpl8ZWevtw2Je25?= =?iso-8859-1?q?9XtXcHEVCLx0DWavrW0jB8LzZ/ClGXEPCyEJ7xBLCbKUdwRddvRfV6lPYJ+S?= =?iso-8859-1?q?KYyXOx7NVwEpe/9OHskCpCzr8dwN1PnR6p7mDMj+njNQgybh1VdxFLv7OyMn?= =?iso-8859-1?q?Bq9W5xSKew7iHZfdIQw0vS8XXl9EQ/BPjEGVwWSDmR0mOWRx0LDriUEUPTJ4?= =?iso-8859-1?q?aAZrxWMFLow4vMfWF+F3hLUKEFJqgMFCDBzHrhpqbjfYeMqVD5mFy+zKQg+I?= =?iso-8859-1?q?0rcDihQmv1MqUyFfDPd3j+PxeUO394ACKYvieA54JxcmdOtHP+pHB7S/FVKa?= =?iso-8859-1?q?DwxMxGllRSaXFmrHP8RtK6ULOes7X+fWvC52Gstcd1CDxudtY4QubftbVYRS?= =?iso-8859-1?q?e7XyuNXnOV/Uy4bXtfyNlQei0Swjx+Aql8SyzsQeNbr3l/SPCFwuo597nkvR?= =?iso-8859-1?q?Fd5MjpgD6QUKwI06QYF7EU1IQQzSssDwMtQJ5WVE1ueakMOm945S6JUyUHLX?= =?iso-8859-1?q?YBBqLR7RiR7ylGxhtzHgcZ474nDoNDZL7swAH6ScxSm4972OVFTN0TCmiMiR?= =?iso-8859-1?q?tYX1AWfcNrMhn12Us5zjh01X9TUPEH9uAxFv/Dn6GtYDLlZyXq7JkLSNNrgS?= =?iso-8859-1?q?T+qBQT/kPRLiLElQ2lzQG4T16f3IaHHCgN9smq8v9bUydnZy5PGCbciGi+qh?= =?iso-8859-1?q?dqYJnrpJTSzSvYpPg0QKRvywAMdjc7lcUAH2HshN9l8ttE0+fzmzQb7UA0Rs?= =?iso-8859-1?q?GL+FWEKFTK8BqJ5PcWWZ5DPFRylrjcTCG1XkrsfP9+Rer8lB+3onqoseMiul?= =?iso-8859-1?q?o511aYjsHrAthGpayHgQZ+83+qYr1bK0Vbb+cBbPSO1t7+YVJZCLzuiwOinR?= =?iso-8859-1?q?Qbg8plje/jKh9Folv80ZkG6573vzesGJ8U1tjqd1XufxrsjTqnghhxa7Inj9?= =?iso-8859-1?q?uOCR7zP6+oDw1VF9jXBbN5hVvgTlGYt2nkL8WX7p6ezRwWVyL+nff9nJXgbO?= =?iso-8859-1?q?LMZ4ydlKzu+XusiIcH7gJZlp0ea4F6j0xoCgqRs4m7D4nXeuP2NPsIpQ70Xo?= =?iso-8859-1?q?sROzNwoOLhQCBdcD4eMZKSPYJeRDjG3SHOZtQAUkvEUDGmMObH57j/RcSTlm?= =?iso-8859-1?q?uOANiJv7WJLq+GYGV1F/dEFAi2bGaMVhDXD8ZuJKzOMmWEn/qSYzgErtdXGO?= =?iso-8859-1?q?hN4o2/xEikOsWImjYlKPX+iPMqm3i6EZPPndITvTMR0Fi3kpXWO0tvzjrbmD?= =?iso-8859-1?q?9vU1D/XbR03e0btxaHBaXGf8+q6/lEostMS6U6L1gQXKaE8OQlhiKGIiCv6i?= =?iso-8859-1?q?OLXCxw9LdjT3cA6SLhq3wXU7/tPnf37EL0?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(396003)(346002)(39860400002)(136003)(376002)(366004)(189003)(199004)(97736004)(6486002)(2906002)(72206003)(14454004)(478600001)(81156014)(36756003)(2501003)(71190400001)(71200400001)(316002)(30864003)(81166006)(7416002)(110136005)(54906003)(6436002)(76176011)(66066001)(50226002)(14444005)(256004)(6512007)(106356001)(8936002)(68736007)(52116002)(2201001)(26005)(186003)(446003)(53936002)(11346002)(6116002)(7736002)(3846002)(25786009)(107886003)(4326008)(305945005)(99286004)(8676002)(105586002)(486006)(86362001)(386003)(476003)(6506007)(102836004)(2616005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB2031; H:MWHPR11MB1920.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: 7Tj8Qz5QDpx5ko2KQvn2VwlWf2av3Uq7hPP/R8nKHbSuvWQszeDy+taah1zLmO0Rz90Ra39H/cr9wuf++cLtt54B7xn4TuCrRB6vuZyX1gOOty3XlqlQvbZXKFLJLp5u+5zrV7ml4f3vsDSa4vQMJt03Wvv3N/06L7sV2ylynARZEIPZYIxc1nxAwXbx0602t/qv0QeazPQXILnqRjvYiYmp05n/3oBIVm3DvA4pf9uEx2klrS0iHz5KdqgzFfd6H033fCnbVCOjeZ6geB5muWY4cpfOHmgXQAK8NlQ4SmDDHmPHBjWuBw8LnQiL2JpDHMvfXK3axBciUA24yo+4vVF1H2ZCrI2Wdty1Gx0WjqkSPG7zJOqKvmaZQCWw6/f2KtK+KksreJO3BrGk753O22wt3tOwuPM1EBrgacQ+8Bo= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: b4bd4073-cbbd-40d0-18e2-08d69294b51b X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:27.1869 (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: MWHPR11MB2031 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075457_184283_FC16AA99 X-CRM114-Status: GOOD ( 15.42 ) 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea To have per SoC PM information add a new structure which embed a member of type struct at91_pm_data. This will allow easy addition of new information without contaminate struct at91_pm_data that is passed to the last phase suspend function (at91_suspend_sram_fn). Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm.c | 118 +++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 56 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 51e808adb00c..ce2ff86968f6 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -39,6 +39,17 @@ extern void at91_pinctrl_gpio_suspend(void); extern void at91_pinctrl_gpio_resume(void); #endif +struct at91_soc_pm { + struct at91_pm_data data; +}; + +static struct at91_soc_pm soc_pm = { + .data = { + .standby_mode = AT91_PM_STANDBY, + .suspend_mode = AT91_PM_ULP0, + }, +}; + static const match_table_t pm_modes __initconst = { { AT91_PM_STANDBY, "standby" }, { AT91_PM_ULP0, "ulp0" }, @@ -47,16 +58,11 @@ static const match_table_t pm_modes __initconst = { { -1, NULL }, }; -static struct at91_pm_data pm_data = { - .standby_mode = AT91_PM_STANDBY, - .suspend_mode = AT91_PM_ULP0, -}; - #define at91_ramc_read(id, field) \ - __raw_readl(pm_data.ramc[id] + field) + __raw_readl(soc_pm.data.ramc[id] + field) #define at91_ramc_write(id, field, value) \ - __raw_writel(value, pm_data.ramc[id] + field) + __raw_writel(value, soc_pm.data.ramc[id] + field) static int at91_pm_valid_state(suspend_state_t state) { @@ -116,21 +122,21 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) if (pm_mode != AT91_PM_ULP1) return 0; - if (!pm_data.pmc || !pm_data.shdwc) + if (!soc_pm.data.pmc || !soc_pm.data.shdwc) return -EPERM; if (!set) { - writel(mode, pm_data.pmc + AT91_PMC_FSMR); + writel(mode, soc_pm.data.pmc + AT91_PMC_FSMR); return 0; } /* SHDWC.WUIR */ - val = readl(pm_data.shdwc + 0x0c); + val = readl(soc_pm.data.shdwc + 0x0c); mode |= (val & 0x3ff); polarity |= ((val >> 16) & 0x3ff); /* SHDWC.MR */ - val = readl(pm_data.shdwc + 0x04); + val = readl(soc_pm.data.shdwc + 0x04); /* Loop through defined wakeup sources. */ for_each_matching_node_and_match(np, sama5d2_ws_ids, &match) { @@ -155,8 +161,8 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) } if (mode) { - writel(mode, pm_data.pmc + AT91_PMC_FSMR); - writel(polarity, pm_data.pmc + AT91_PMC_FSPR); + writel(mode, soc_pm.data.pmc + AT91_PMC_FSMR); + writel(polarity, soc_pm.data.pmc + AT91_PMC_FSPR); } else { pr_err("AT91: PM: no ULP1 wakeup sources found!"); } @@ -171,18 +177,18 @@ static int at91_pm_begin(suspend_state_t state) { switch (state) { case PM_SUSPEND_MEM: - pm_data.mode = pm_data.suspend_mode; + soc_pm.data.mode = soc_pm.data.suspend_mode; break; case PM_SUSPEND_STANDBY: - pm_data.mode = pm_data.standby_mode; + soc_pm.data.mode = soc_pm.data.standby_mode; break; default: - pm_data.mode = -1; + soc_pm.data.mode = -1; } - return at91_pm_config_ws(pm_data.mode, true); + return at91_pm_config_ws(soc_pm.data.mode, true); } /* @@ -194,10 +200,10 @@ static int at91_pm_verify_clocks(void) unsigned long scsr; int i; - scsr = readl(pm_data.pmc + AT91_PMC_SCSR); + scsr = readl(soc_pm.data.pmc + AT91_PMC_SCSR); /* USB must not be using PLLB */ - if ((scsr & pm_data.uhp_udp_mask) != 0) { + if ((scsr & soc_pm.data.uhp_udp_mask) != 0) { pr_err("AT91: PM - Suspend-to-RAM with USB still active\n"); return 0; } @@ -208,7 +214,7 @@ static int at91_pm_verify_clocks(void) if ((scsr & (AT91_PMC_PCK0 << i)) == 0) continue; - css = readl(pm_data.pmc + AT91_PMC_PCKR(i)) & AT91_PMC_CSS; + css = readl(soc_pm.data.pmc + AT91_PMC_PCKR(i)) & AT91_PMC_CSS; if (css != AT91_PMC_CSS_SLOW) { pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css); return 0; @@ -230,7 +236,7 @@ static int at91_pm_verify_clocks(void) */ int at91_suspend_entering_slow_clock(void) { - return (pm_data.mode >= AT91_PM_ULP0); + return (soc_pm.data.mode >= AT91_PM_ULP0); } EXPORT_SYMBOL(at91_suspend_entering_slow_clock); @@ -243,14 +249,14 @@ static int at91_suspend_finish(unsigned long val) flush_cache_all(); outer_disable(); - at91_suspend_sram_fn(&pm_data); + at91_suspend_sram_fn(&soc_pm.data); return 0; } static void at91_pm_suspend(suspend_state_t state) { - if (pm_data.mode == AT91_PM_BACKUP) { + if (soc_pm.data.mode == AT91_PM_BACKUP) { pm_bu->suspended = 1; cpu_suspend(0, at91_suspend_finish); @@ -289,7 +295,7 @@ static int at91_pm_enter(suspend_state_t state) /* * Ensure that clocks are in a valid state. */ - if (pm_data.mode >= AT91_PM_ULP0 && + if (soc_pm.data.mode >= AT91_PM_ULP0 && !at91_pm_verify_clocks()) goto error; @@ -318,7 +324,7 @@ static int at91_pm_enter(suspend_state_t state) */ static void at91_pm_end(void) { - at91_pm_config_ws(pm_data.mode, false); + at91_pm_config_ws(soc_pm.data.mode, false); } @@ -351,7 +357,7 @@ static void at91rm9200_standby(void) " str %2, [%1, %3]\n\t" " mcr p15, 0, %0, c7, c0, 4\n\t" : - : "r" (0), "r" (pm_data.ramc[0]), + : "r" (0), "r" (soc_pm.data.ramc[0]), "r" (1), "r" (AT91_MC_SDRAMC_SRR)); } @@ -374,7 +380,7 @@ static void at91_ddr_standby(void) at91_ramc_write(0, AT91_DDRSDRC_MDR, mdr); } - if (pm_data.ramc[1]) { + if (soc_pm.data.ramc[1]) { saved_lpr1 = at91_ramc_read(1, AT91_DDRSDRC_LPR); lpr1 = saved_lpr1 & ~AT91_DDRSDRC_LPCB; lpr1 |= AT91_DDRSDRC_LPCB_SELF_REFRESH; @@ -392,14 +398,14 @@ static void at91_ddr_standby(void) /* self-refresh mode now */ at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr0); - if (pm_data.ramc[1]) + if (soc_pm.data.ramc[1]) at91_ramc_write(1, AT91_DDRSDRC_LPR, lpr1); cpu_do_idle(); at91_ramc_write(0, AT91_DDRSDRC_MDR, saved_mdr0); at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0); - if (pm_data.ramc[1]) { + if (soc_pm.data.ramc[1]) { at91_ramc_write(0, AT91_DDRSDRC_MDR, saved_mdr1); at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); } @@ -429,7 +435,7 @@ static void at91sam9_sdram_standby(void) u32 lpr0, lpr1 = 0; u32 saved_lpr0, saved_lpr1 = 0; - if (pm_data.ramc[1]) { + if (soc_pm.data.ramc[1]) { saved_lpr1 = at91_ramc_read(1, AT91_SDRAMC_LPR); lpr1 = saved_lpr1 & ~AT91_SDRAMC_LPCB; lpr1 |= AT91_SDRAMC_LPCB_SELF_REFRESH; @@ -441,13 +447,13 @@ static void at91sam9_sdram_standby(void) /* self-refresh mode now */ at91_ramc_write(0, AT91_SDRAMC_LPR, lpr0); - if (pm_data.ramc[1]) + if (soc_pm.data.ramc[1]) at91_ramc_write(1, AT91_SDRAMC_LPR, lpr1); cpu_do_idle(); at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr0); - if (pm_data.ramc[1]) + if (soc_pm.data.ramc[1]) at91_ramc_write(1, AT91_SDRAMC_LPR, saved_lpr1); } @@ -480,14 +486,14 @@ static __init void at91_dt_ramc(void) const struct ramc_info *ramc; for_each_matching_node_and_match(np, ramc_ids, &of_id) { - pm_data.ramc[idx] = of_iomap(np, 0); - if (!pm_data.ramc[idx]) + soc_pm.data.ramc[idx] = of_iomap(np, 0); + if (!soc_pm.data.ramc[idx]) panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx); ramc = of_id->data; if (!standby) standby = ramc->idle; - pm_data.memctrl = ramc->memctrl; + soc_pm.data.memctrl = ramc->memctrl; idx++; } @@ -509,12 +515,12 @@ static void at91rm9200_idle(void) * Disable the processor clock. The processor will be automatically * re-enabled by an interrupt or by a reset. */ - writel(AT91_PMC_PCK, pm_data.pmc + AT91_PMC_SCDR); + writel(AT91_PMC_PCK, soc_pm.data.pmc + AT91_PMC_SCDR); } static void at91sam9_idle(void) { - writel(AT91_PMC_PCK, pm_data.pmc + AT91_PMC_SCDR); + writel(AT91_PMC_PCK, soc_pm.data.pmc + AT91_PMC_SCDR); cpu_do_idle(); } @@ -566,8 +572,8 @@ static void __init at91_pm_sram_init(void) static bool __init at91_is_pm_mode_active(int pm_mode) { - return (pm_data.standby_mode == pm_mode || - pm_data.suspend_mode == pm_mode); + return (soc_pm.data.standby_mode == pm_mode || + soc_pm.data.suspend_mode == pm_mode); } static int __init at91_pm_backup_init(void) @@ -586,7 +592,7 @@ static int __init at91_pm_backup_init(void) return ret; } - pm_data.sfrbu = of_iomap(np, 0); + soc_pm.data.sfrbu = of_iomap(np, 0); of_node_put(np); np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam"); @@ -620,8 +626,8 @@ static int __init at91_pm_backup_init(void) return 0; securam_fail: - iounmap(pm_data.sfrbu); - pm_data.sfrbu = NULL; + iounmap(soc_pm.data.sfrbu); + soc_pm.data.sfrbu = NULL; return ret; } @@ -630,10 +636,10 @@ static void __init at91_pm_use_default_mode(int pm_mode) if (pm_mode != AT91_PM_ULP1 && pm_mode != AT91_PM_BACKUP) return; - if (pm_data.standby_mode == pm_mode) - pm_data.standby_mode = AT91_PM_ULP0; - if (pm_data.suspend_mode == pm_mode) - pm_data.suspend_mode = AT91_PM_ULP0; + if (soc_pm.data.standby_mode == pm_mode) + soc_pm.data.standby_mode = AT91_PM_ULP0; + if (soc_pm.data.suspend_mode == pm_mode) + soc_pm.data.suspend_mode = AT91_PM_ULP0; } static void __init at91_pm_modes_init(void) @@ -651,7 +657,7 @@ static void __init at91_pm_modes_init(void) goto ulp1_default; } - pm_data.shdwc = of_iomap(np, 0); + soc_pm.data.shdwc = of_iomap(np, 0); of_node_put(np); ret = at91_pm_backup_init(); @@ -665,8 +671,8 @@ static void __init at91_pm_modes_init(void) return; unmap: - iounmap(pm_data.shdwc); - pm_data.shdwc = NULL; + iounmap(soc_pm.data.shdwc); + soc_pm.data.shdwc = NULL; ulp1_default: at91_pm_use_default_mode(AT91_PM_ULP1); backup_default: @@ -709,14 +715,14 @@ static void __init at91_pm_init(void (*pm_idle)(void)) platform_device_register(&at91_cpuidle_device); pmc_np = of_find_matching_node_and_match(NULL, atmel_pmc_ids, &of_id); - pm_data.pmc = of_iomap(pmc_np, 0); - if (!pm_data.pmc) { + soc_pm.data.pmc = of_iomap(pmc_np, 0); + if (!soc_pm.data.pmc) { pr_err("AT91: PM not supported, PMC not found\n"); return; } pmc = of_id->data; - pm_data.uhp_udp_mask = pmc->uhp_udp_mask; + soc_pm.data.uhp_udp_mask = pmc->uhp_udp_mask; if (pm_idle) arm_pm_idle = pm_idle; @@ -726,8 +732,8 @@ static void __init at91_pm_init(void (*pm_idle)(void)) if (at91_suspend_sram_fn) { suspend_set_ops(&at91_pm_ops); pr_info("AT91: PM: standby: %s, suspend: %s\n", - pm_modes[pm_data.standby_mode].pattern, - pm_modes[pm_data.suspend_mode].pattern); + pm_modes[soc_pm.data.standby_mode].pattern, + pm_modes[soc_pm.data.suspend_mode].pattern); } else { pr_info("AT91: PM not supported, due to no SRAM allocated\n"); } @@ -793,8 +799,8 @@ static int __init at91_pm_modes_select(char *str) if (suspend < 0) return 0; - pm_data.standby_mode = standby; - pm_data.suspend_mode = suspend; + soc_pm.data.standby_mode = standby; + soc_pm.data.suspend_mode = suspend; return 0; } From patchwork Thu Feb 14 15:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813091 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 B584A1399 for ; Thu, 14 Feb 2019 15:55:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A259B2EB41 for ; Thu, 14 Feb 2019 15:55:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96C0B2EC86; Thu, 14 Feb 2019 15:55: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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 36A6E2EB41 for ; Thu, 14 Feb 2019 15:55:32 +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=zUrHS0WPcEEs4pqjaVZzqxkJ/hzonxMe4ayOVZ9kjfY=; b=F9VWRR51FcgsKi 0oJo5dBlC8dqNVYjc4nAkOmnJqVqxUkY/jDuFHivCsyk1kZeDi3aTt20mww/p3iJIjC5dF4JBfRKt 8ynl2SNuMAdplejIoyl1qTHUw0KF9zXivmf8gNOGZadAMPlbL1UwSLD5nOPFpKNuxAqsTxdpUiSDD 5zfyLIzuNAAryJB56sm0S1w0iVZrebd/q+5QrK97KSK87Le5X23fLapR045FQBiKbwVMkretRQNq0 AzoXJCrsnI5lgD8yKluxkX1Y/ThUq2so9Qbmyi00mT26QvghE/lUNA/0x6PO1XppFrmn5smLihXx2 yfIDjMdx/zfs68nsQjkA==; 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 1guJMI-0007aR-Cy; Thu, 14 Feb 2019 15:55:30 +0000 Received: from esa6.microchip.iphmx.com ([216.71.154.253]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJLl-0005qz-9D for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:55:03 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="23863288" 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; 14 Feb 2019 08:54:43 -0700 Received: from NAM02-CY1-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; Thu, 14 Feb 2019 08:54:39 -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=ATHP6A5171az4nQE4H8FItr5BbagYe0Srq1cthSg0g8=; b=FwOKoA6Ioq2S1jIYE1uy61TV4Pacozj5t4PqQtSPY8iu+cnynhpuXfRLsyc2rMxQuzNWl/iHXx+80iC50hqePrdLR1KYKAC/+STnvMCkxd5Btuq63qVP0XSlIHZvJwZpSMCrTcj++CS1u0kByNlXHamt/E9Zzymo+2H2IW5y0Ts= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB2031.namprd11.prod.outlook.com (10.169.236.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.17; Thu, 14 Feb 2019 15:54:37 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:54:37 +0000 From: To: , , , , , , , Subject: [PATCH 2/8] dt-bindings: arm: atmel: add binding for SAM9X60 SoC Thread-Topic: [PATCH 2/8] dt-bindings: arm: atmel: add binding for SAM9X60 SoC Thread-Index: AQHUxH2WFsa+KrpqTkKweEGzFLdhNA== Date: Thu, 14 Feb 2019 15:54:37 +0000 Message-ID: <1550159642-26878-3-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ca2bb961-0adb-4f46-ae12-08d69294b864 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB2031; x-ms-traffictypediagnostic: MWHPR11MB2031: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB2031; 23:vn+v05ThmpDJZmfTRGf4OcaHTW3zGT8wSzoxabZ?= =?iso-8859-1?q?8g/8jPP01h433VJ?= =?iso-8859-1?q?MUCJJh6BAcf4N8sbKseGlZL9rd0JEWMUFvjS2ju6Eg0qR74QUpur5oMghKFa?= =?iso-8859-1?q?VMk7wjT7DJEVtopfIYFO4lnKZ9IiPJU/EKIWm5oNUC5RESVgkOibq7d0PFqf?= =?iso-8859-1?q?v4txO5a7YmGPaHWZddxNwElcfJ4/FA9lSZJaL8TLwg9OSexzzgimrvIfxGLr?= =?iso-8859-1?q?5ObiEnQ8lbA4w+pSS6Q0tgTdfOnvByRTK/Ch4308dmu4t9baHdvyoIz0eb5c?= =?iso-8859-1?q?p/L3rDtbsE+hqIBsZkUeUmy1R/S0HfIrs+ppEsR/O3PJp9zHmOnBj/9Bf1rK?= =?iso-8859-1?q?EjxYrQ4KiKLgNTwiXjgz5Kn/ma+kkRflqKiczQs/0AUboCwL2+Ymlq8ag9i1?= =?iso-8859-1?q?dhQxmyuIXaz97wxVlcyM07POiVPte5dadIItgBguBFmdRJd4p9OkSPFt1cP6?= =?iso-8859-1?q?mctM/wkTvzsO8gtBc9wZ+86aOXDAIgiFcszMw93TLUyvNChbYJmM/bbTqHSh?= =?iso-8859-1?q?1ufApVgaXYJ9Gl9l6QfckH8Q7oQ0D1O0GzZ6MMtupD0fx7kDqDRVIKkVYLo0?= =?iso-8859-1?q?QOljdOMOJZ3jqGA4VOM0YlV2gPNxMontKss4tKtjITfFlo1mEA+j0yJeV3GU?= =?iso-8859-1?q?Ts+3PMCSu6HZvst9nd26cY7qnZrGZ2eHNMtzT0oG4i1HDY8+F9vmklB7Squp?= =?iso-8859-1?q?/3elKoHua6cNUOXtJd3BJ0Gg+Zcucp9W2ETcx/Xj0KXx4EvRc804jege6YLk?= =?iso-8859-1?q?lXXWc7Z70OBJH2AHmkjK89lPl37M3oz0PecT5n/UniLW+4C69wb8qutpU4m/?= =?iso-8859-1?q?wDwsTtmI1odPNx5KbI/wvBCJG/DZRiMIkls7136vD9WYmMDpVMS328fsuFVN?= =?iso-8859-1?q?MMDPUqbmry5F92hb8D9uYakubDhKR1T7dw3H3h0DCaMTVgKuJLJd/m/7S3pz?= =?iso-8859-1?q?uU0bwDLTiyalKRbYtEwx2cKWZhlvYnM3onmbUMKSpKyssc+i/Zn0eF/Wc4EI?= =?iso-8859-1?q?KNZqCHjqq4NUJss6ovsy4VlrOutRWfKw04IzNDoeNDXR0KYzyA8+vW/u5OUX?= =?iso-8859-1?q?zO/qw59vaKnqLwW/nJgui0/graQKGKtwiZZg/XDxCXhmeMFEaHSAdAHNtyZ9?= =?iso-8859-1?q?cw2aTy4ofFU3tLko7VCGNQl+eJkPxDiy+xuN1BDBlALU0Jlrwoo+K8BHos93?= =?iso-8859-1?q?tp35ydUC5qMrFzmYV38F8SXda5hegfW4nReHOQiBRgIioqU2I1Uxnvvm+GkB?= =?iso-8859-1?q?U9XV1ugq/wTwNDHqafBtrkVWVQ?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39860400002)(136003)(376002)(366004)(189003)(199004)(97736004)(6486002)(4744005)(2906002)(72206003)(14454004)(478600001)(81156014)(36756003)(2501003)(71190400001)(71200400001)(316002)(81166006)(7416002)(110136005)(54906003)(6436002)(76176011)(66066001)(50226002)(256004)(6512007)(106356001)(8936002)(68736007)(52116002)(2201001)(26005)(186003)(446003)(53936002)(11346002)(6116002)(7736002)(3846002)(25786009)(107886003)(4326008)(305945005)(99286004)(8676002)(105586002)(486006)(86362001)(386003)(476003)(6506007)(102836004)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB2031; H:MWHPR11MB1920.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: z3m0qa/I13YuBy1PhkC19yAePXtUkK0LLLP6sPq8dS/Bao0XGE8T/rIBr5es6eNzpNnEhGnhkphueeZPVAnqQsHIvF7drhBRnm4uDhz+ziyytbDYzB+p3rs3Ww7DsmDb7oyQORSUMEOkWXv/NH8S+OBTUxHwXwPRIZYwM4eJ5makI9BmNxVDteE6LP+SMpD2g1LwgwT4WmwPETl0O1JAy1x6w43VoAr87P09FoqT5pcSjflJu/jhU8T1swHdZFSLqTqfbJhgz58JZ02hDa+65zklFOKmMjTm0ktQCgbGARWvZ7S1NE2fvNnTbz4QEIdvcRC1LgJ5PB+KE+IE03+xSo/Qgl87E5Ll2EmMSYd/CjPowwmcmhTMy0rS8bBu/9tCNwLTt/SXqDQPlC52/0KcGBjO+6D338iYOH1ZkJzxOs8= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: ca2bb961-0adb-4f46-ae12-08d69294b864 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:32.2069 (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: MWHPR11MB2031 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075457_640872_B5AC652C X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea Add device tree binding for SAM9X60 SoC. Signed-off-by: Claudiu Beznea --- Documentation/devicetree/bindings/arm/atmel-at91.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt index 4bf1b4da7659..99dee23c74a4 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt @@ -25,6 +25,7 @@ compatible: must be one of: o "atmel,at91sam9n12" o "atmel,at91sam9rl" o "atmel,at91sam9xe" + o "microchip,sam9x60" * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific SoC family: o "atmel,sama5d2" shall be extended with the specific SoC compatible: From patchwork Thu Feb 14 15:54:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813099 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 285951390 for ; Thu, 14 Feb 2019 15:55:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15FD62EC85 for ; Thu, 14 Feb 2019 15:55:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 095452EC88; Thu, 14 Feb 2019 15:55: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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 96B542EC85 for ; Thu, 14 Feb 2019 15:55: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=ei+BGR7IwjWhcws+/PJsEV1JI9XvlmMY9iPAIOELdXw=; b=GWL+GOUnCiNHaU w3YAkUmdtufMUG1PU1Pjc2SBR3B/iuuPxYoLBbj1NW8TzteJ4Uk821oPg7plmW4bwMRUHOI8Uqzhz 7FOc/tWnnl4hMWu1rWnudw1i5UeVb/jBVhf5t/piBbU2fIkvQeTsXpbEITLOA7iTeNRzScEUuMaUf BnCv1hKhl41xyCok+cDZ+d3KTTT2TZuovY9zX+rDTaSmzBS854gJ9EzvOp+znydC8M4NEWgD0EkTN NoHv4pPWmmb9ZB9zk0O0GUvvrLCbsJ7Y3ZXN5b7DIONY8eovaenEtVAImMqA8KK4LCrgBT24WnG0Z CK0lbZxY4AxTfIxN9IKQ==; 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 1guJMe-00083r-4b; Thu, 14 Feb 2019 15:55:52 +0000 Received: from esa6.microchip.iphmx.com ([216.71.154.253]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJLn-0005mD-Mw for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:55:10 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="23863290" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 14 Feb 2019 08:54:44 -0700 Received: from NAM03-CO1-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; Thu, 14 Feb 2019 08:54:44 -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=65BVjeIEXzp2/+wrCys8o6UEdbRcpqbRkkZky+uuU+M=; b=D6q0Xez5g8d2UQD/cS5Q2pXJ0NYgCkWA55C5ljKbcEpnJq5TsHxC5FzBWiR3etQwYXNCKG3R30tYA5g2M0VrRE996uSw7TYhHvZ6Nx3/xZ1jtNRQVglvayOO5KSbwRXP7URh8bIRJloJM+9k4blHg1zOT+I8VhpfEqM/lN6rWqU= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB1472.namprd11.prod.outlook.com (10.172.53.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 14 Feb 2019 15:54:42 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:54:42 +0000 From: To: , , , , , , , Subject: [PATCH 3/8] ARM: at91: pm: initial PM support for SAM9X60 Thread-Topic: [PATCH 3/8] ARM: at91: pm: initial PM support for SAM9X60 Thread-Index: AQHUxH2ZASldydEtRkacJovuHMJ48Q== Date: Thu, 14 Feb 2019 15:54:41 +0000 Message-ID: <1550159642-26878-4-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: bda45bed-ce51-46d9-d80f-08d69294bb55 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1472; x-ms-traffictypediagnostic: MWHPR11MB1472: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB1472; 23:EwpdkFC7RMGpXMdtvUJTvhSuHV6Ef7t88KZZTtD?= =?iso-8859-1?q?gId1UJ7YBNb2FIO?= =?iso-8859-1?q?Qdmrr1xqgbXxT6+6p3M3jEb2tSFVBwgILfFxwwCfVDDcGPJxHu+zu21/hyGx?= =?iso-8859-1?q?MSLKGAESWbo+xLvKQEgNbfGE6J54YvTv5PR5eIEGpPzaBBz/MobIXMJs0+oY?= =?iso-8859-1?q?obkd/Nm16EIfZsuxvnvQ7vB+FWSdfZtDE7Z3XqD4paUBeMbtQn9/rBOJDbzc?= =?iso-8859-1?q?0ko+NnVO/lIy47f//yy60X8JsCoWqjX6Acf/thka6xNRoWy9XMVXrozKQ+Sg?= =?iso-8859-1?q?MPa+k044z4t105bsIpclumy/8oCVu+sVFdMH2Ey1k7nUfniHkKH0ZBeqLB3M?= =?iso-8859-1?q?T6KloFicjBq8rG9PG919fzurHw1leGj5FO3HTrMkEDOKuHzZL1NakDiMxpDZ?= =?iso-8859-1?q?L1QBK9Zxekhm9oJjp4SEvmkNEnVsW518E1+GFksqKyUtnc71msA/ayk194g7?= =?iso-8859-1?q?3dk2d7hRyBbEz/135TOBcxHUSSPod0P0t3qYQZGgMPFOOlKwDJjgV6O6ynZB?= =?iso-8859-1?q?Deit2wddk/SA6uBuOyp8ugFpd2P6qf3itYrsY0gN2SpfB0EcYIY94Fd3/lIq?= =?iso-8859-1?q?qO84T1AVyDcSwAlJ0TD4aLZZjNaQBmWoIznTL8DjK6yrpuP2wF+Nnj1LrWlJ?= =?iso-8859-1?q?pXEN9so4CZ6mC+yb5ZN7KbDmlzjIcm4Ijv1qgzxTN1tjfitESbmZ+ImgdVyB?= =?iso-8859-1?q?AD/wuNLqdepG6jXnKcQh0X7VNtCr8XTGuXAy0cwo3CyVzmCZKzhE2zChdl9K?= =?iso-8859-1?q?n9Zom8gJpxKKCs4IgybnKNbk+ubmjErCnottHIkRkqFuWD/pAs6XoGvciVtd?= =?iso-8859-1?q?eTwPPQcCGFp6YTJw+HJ4OxLpu4eVZBYU/dsaeGdCcHwdOSv1tBHmEL+p3Ykj?= =?iso-8859-1?q?Teaky90a0bYZKDKS0g4V56EgZSWVtsaqNTon0ygwz3UkQRDTmNgANB+vVZXE?= =?iso-8859-1?q?JLNugs08s+VmcbLqzeeWwMR3xxA6mY15q5XXlsXF9oUZjnywM3bGgAKAkEnl?= =?iso-8859-1?q?anKaRcn47ZW6jnFMpGcez8GhoB61ro+Off9beGwuvVJ+/pBEwsQtRFHAF2Tf?= =?iso-8859-1?q?AKTkPlEaMNBo3qN6a0jdjSfUVe8gX6kVBjkCLL4GGCcbXqE5jRhc6HVZuDJS?= =?iso-8859-1?q?ULJ/JzSwJrzf4VfaxNh+9xUUkKrh2OTMEDeLCnzzyYLjrJA/D2Q4fyue873o?= =?iso-8859-1?q?LlIsWkA+5HNj1iM1yJ5x8M0wWGafLu6ehkRsEI09fO3LL0b7JuAvWCTninbV?= =?iso-8859-1?q?2NQiXseswcLJiVW6L64DCCAteh?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(366004)(136003)(39860400002)(189003)(199004)(50226002)(478600001)(52116002)(2501003)(110136005)(25786009)(316002)(66066001)(8936002)(2906002)(8676002)(72206003)(68736007)(4326008)(54906003)(76176011)(81166006)(99286004)(6512007)(256004)(81156014)(305945005)(7736002)(6486002)(6436002)(26005)(186003)(6506007)(476003)(106356001)(105586002)(7416002)(14454004)(446003)(6116002)(102836004)(386003)(11346002)(97736004)(2201001)(71190400001)(107886003)(71200400001)(3846002)(86362001)(53936002)(2616005)(36756003)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1472; H:MWHPR11MB1920.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: KS+iJFWR0OgDA0HJaOw64IK1cWxh5PkvRcfBfOoDA2wjrBP8XBrJYW6pdtDyhUmE9ep36PF4xWizndcv9CEdUiqbSS5MRV0P3GOqUKs8cdXQUflzsmqhh329v7w4n+oHK8IknH0xouKEDm/ON701mJVZmt/XAIBVK5rOMbGK3Z7CxkZko2jy5hVZ91y0PCsVb4HOu0ZNUAST/G6Il1K+X4h3zdAI4s48Y9tIf+r1Pbt02dgt5FF9PjIrfW28dSokhEOHYWRU/gWco1L01txSORSnHhKLlNfEtZw4cVKjN7zI8HHZTePFZTq69N3xAruWnbqbUgAGHVPd0n97hbxLIY/HXzDzypzez0d1/CoDXIjx8HmnXpd91ioW/SAbnpiiQW9rN6Eqv4dfNNduT7DQYaRF/Rlz5khuMpWq9tKNyE0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: bda45bed-ce51-46d9-d80f-08d69294bb55 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:37.4892 (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: MWHPR11MB1472 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075500_425661_DB93B786 X-CRM114-Status: GOOD ( 10.00 ) 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea Add initial PM support for SAM9X60. This include idle, WFI and ULP0. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/at91sam9.c | 18 ++++++++++++++++++ arch/arm/mach-at91/generic.h | 2 ++ arch/arm/mach-at91/pm.c | 14 ++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c index 3dbdef4d3cbf..c12563b09656 100644 --- a/arch/arm/mach-at91/at91sam9.c +++ b/arch/arm/mach-at91/at91sam9.c @@ -32,3 +32,21 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9") .init_machine = at91sam9_init, .dt_compat = at91_dt_board_compat, MACHINE_END + +static void __init sam9x60_init(void) +{ + of_platform_default_populate(NULL, NULL, NULL); + + sam9x60_pm_init(); +} + +static const char *const sam9x60_dt_board_compat[] __initconst = { + "microchip,sam9x60", + NULL +}; + +DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60") + /* Maintainer: Microchip */ + .init_machine = sam9x60_init, + .dt_compat = sam9x60_dt_board_compat, +MACHINE_END diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index e2bd17237964..72b45accfa0f 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -14,11 +14,13 @@ #ifdef CONFIG_PM extern void __init at91rm9200_pm_init(void); extern void __init at91sam9_pm_init(void); +extern void __init sam9x60_pm_init(void); extern void __init sama5_pm_init(void); extern void __init sama5d2_pm_init(void); #else static inline void __init at91rm9200_pm_init(void) { } static inline void __init at91sam9_pm_init(void) { } +static inline void __init sam9x60_pm_init(void) { } static inline void __init sama5_pm_init(void) { } static inline void __init sama5d2_pm_init(void) { } #endif diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index ce2ff86968f6..e42db02eafe4 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -518,6 +518,11 @@ static void at91rm9200_idle(void) writel(AT91_PMC_PCK, soc_pm.data.pmc + AT91_PMC_SCDR); } +static void at91sam9x60_idle(void) +{ + cpu_do_idle(); +} + static void at91sam9_idle(void) { writel(AT91_PMC_PCK, soc_pm.data.pmc + AT91_PMC_SCDR); @@ -754,6 +759,15 @@ void __init at91rm9200_pm_init(void) at91_pm_init(at91rm9200_idle); } +void __init sam9x60_pm_init(void) +{ + if (!IS_ENABLED(CONFIG_SOC_AT91SAM9)) + return; + + at91_dt_ramc(); + at91_pm_init(at91sam9x60_idle); +} + void __init at91sam9_pm_init(void) { if (!IS_ENABLED(CONFIG_SOC_AT91SAM9)) From patchwork Thu Feb 14 15:54:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813101 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 4D1E31390 for ; Thu, 14 Feb 2019 15:56:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 381BF2EC85 for ; Thu, 14 Feb 2019 15:56:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 293E62DD55; Thu, 14 Feb 2019 15:56:13 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 D39F12DD55 for ; Thu, 14 Feb 2019 15:56:12 +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=dAIWL1BWyY++8DqHK0+OQ3LUBMKHmXBn8Dd4eCO1O2Y=; b=I1RgW4pj1Mqnww gteNicR90yHmTu9WVg6HIc33yZ4ckP+2rzDwYX79z2SEi62VbZtKyT1NG3SBRQnV6MxGBP706lc6+ NaU90vbNXZxP13Ycj16QkeAKKJn0QeKVDAtsAzzZ4ZvejzwltXBMagYUhrn4SqqTde+MdY97UZxeP 1c2C0Yqfv1pVLKsvUjbfLR+y6xW7po2NBQuHKf8gv6EXvx0z+HHOp2WLooe2nwumumF5YGrvW4Whz jBQgKzFAQ2A+Oo6WTNucqy6YSiyZrrKwm6elkWUfZvRhPyr2jGSjkMEth9Xr9Ox4Rvo7lgBLAQ1t7 x2Q7SSsK5RTVz6pM8OxA==; 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 1guJMp-0008Hn-Mp; Thu, 14 Feb 2019 15:56:03 +0000 Received: from esa6.microchip.iphmx.com ([216.71.154.253]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJLo-0005uL-GY for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:55:12 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="23863296" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 14 Feb 2019 08:54:49 -0700 Received: from NAM03-CO1-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; Thu, 14 Feb 2019 08:54: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=pGchSv9RbTaQmFcdqhfXfcH7NXDgKrn5e+tMQXSJON4=; b=OsOwH3f4iLVg12ClV+6CrGfHVbpiBHX/gCn3Kg3k4XQz69gbkhgEyyvs+zBcozd+fWMk/3msGE8g0swYqBTAUkfByXhTIRtSjmbs5NKma5eSRrspmydLNPdS/iG5TK4LghYWC3hiuuo/61s68HhghEPJtqwxAVR7mR3sJ91ywuA= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB1472.namprd11.prod.outlook.com (10.172.53.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 14 Feb 2019 15:54:47 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:54:47 +0000 From: To: , , , , , , , Subject: [PATCH 4/8] ARM: at91: pm: keep at91_pm_backup_init() only for SAMA5D2 SoCs Thread-Topic: [PATCH 4/8] ARM: at91: pm: keep at91_pm_backup_init() only for SAMA5D2 SoCs Thread-Index: AQHUxH2cEKHImCWzc0WPV8IYMoowWQ== Date: Thu, 14 Feb 2019 15:54:47 +0000 Message-ID: <1550159642-26878-5-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d3bb4697-e9ca-4649-a0ea-08d69294be50 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1472; x-ms-traffictypediagnostic: MWHPR11MB1472: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB1472; 23:77mAhVBDf18ysdSTNvhjybAe4/FJXvMUMHmPdBm?= =?iso-8859-1?q?102YLUEdNhTzHxi?= =?iso-8859-1?q?JVXhbOahwmH/MMSeROKoPybS+hQOySWlVUWQH7zi1ib6VOLf5la19CHMjqE6?= =?iso-8859-1?q?KrX1IolGzugRdg6xv89vTs60tBlFJ+jWyYsMYUvNmsiFMkBqJyY6zYDmPHGT?= =?iso-8859-1?q?OHtpjmecY8xVdBDu6WkrG1TUgjvs5Awr7zYU13EAmQcPwxDpC0bMam95tZVO?= =?iso-8859-1?q?wAuK5uw1V/OlX7UUlXxloCbQ9QKgB/WR6w1DG2wmpypDEldG8w4tEdozORwZ?= =?iso-8859-1?q?WYxQwO+T0Ddulrn6wQ7Orpkt5m6LvSv7oiQsDaE5oOY6z/38QnKamrxVwjT7?= =?iso-8859-1?q?0cFKpgVRZFup0CLsl5L/0z8ECgKj+jd4Z9luBjo3MnBFxDUcvnU8Rt0T5jY0?= =?iso-8859-1?q?XqflzGJa+SCQP6eiUoVk0v/ViM6X5TKToOPacCQJZjungdkNn1reus3WUZGU?= =?iso-8859-1?q?dQMPcLIhVt6EXdFmPFeEXKHJufRDtYPl1jE52QPwPAMMTFQ1TJCUtLRXwEW8?= =?iso-8859-1?q?JbqTIDAWy7I3BGE1g14+ydEFwRBUJnPjOV2nBGqJndM+POLiOuiwKR//NmFa?= =?iso-8859-1?q?fJo6+5orE5YMS6xzuvdJ9Bfb/ilUAusedne7/1LmhVENaCGXDqyCR861VjO9?= =?iso-8859-1?q?z+IDmE/smVFA4B/LISb/iM8m8YAcHVFC3DYvIsysiglzDEEbrNnN7v+FfrjD?= =?iso-8859-1?q?ChsWAGDAsUatN/riZ81IHfDqh+RjTJdeTDfOdcYoD1ePxEH6t0wguW58BYzZ?= =?iso-8859-1?q?x5D4jcz8vQQJ8m+r4WEZaBttouEHbjr5RggFtIwauQE0drTRNCUJ1wVTGErD?= =?iso-8859-1?q?9m+/QXyS3qIJLGfZ9bJnti3eat7eVQNu18VpYUTjiOXHaso08oCIAh5/Yv0g?= =?iso-8859-1?q?e2R3s6a7BXuPwukaSbL8LExfOJtRQF0ia9SL9Exh2+z1mw0lUylxfLBDUwYL?= =?iso-8859-1?q?KMqnXk4nn92FRN3tkGkkbUWa/SlbxGPDI36LGR2qN0o9Igp2MbsZ0LNA0X3k?= =?iso-8859-1?q?Ok8ZWyBUmS1J2OeQK5dRoCK7hvOw9jahkRrTOf2OzeK3XvpaF6b7Bg61hqUO?= =?iso-8859-1?q?VczhGS6P8lih94GsnS0YXrJd24t8e9HlQsrMIgMLins94nTH7wgVex7KqpMj?= =?iso-8859-1?q?48feCd+9d2PFxIVOZ8bjPppM0IJ+qhwQj2U8ETOuEemwU0aA3TDFbKQJZVdp?= =?iso-8859-1?q?l5R4GUM40lfAomyg/rVAG5l7Ias5Hz1H6njMyHmz9hUsdIblmN35WMYGf0dz?= =?iso-8859-1?q?Y38HGQwe92NXlKo5NGtivMRPXL5blIaRlYHdhFa0E8L+zz8Q=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6029001)(346002)(396003)(376002)(366004)(136003)(39860400002)(189003)(199004)(50226002)(478600001)(52116002)(2501003)(110136005)(25786009)(316002)(66066001)(8936002)(2906002)(8676002)(72206003)(68736007)(4326008)(54906003)(76176011)(81166006)(99286004)(6512007)(256004)(81156014)(305945005)(7736002)(6486002)(6436002)(26005)(186003)(6506007)(476003)(106356001)(105586002)(7416002)(14454004)(446003)(6116002)(102836004)(386003)(11346002)(97736004)(2201001)(71190400001)(107886003)(4744005)(71200400001)(3846002)(86362001)(53936002)(2616005)(36756003)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1472; H:MWHPR11MB1920.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: Liu6btIHccEwIDx7ySMotSvHN9g22KKd544q77C60EjBJNxBNGON7NAUJ4+Oc1251JIN+5qqu08qfxJifHXGrtuvP0Ej1Yr+fNJbm6Mi5smrAPnwgSGzWhR4zQvACYDB5QshktnRpp2X2bPzuaZzxTBEYVSTtKu1x29o8JKGZUQIcH/tJgDs1sJLqwvHQNTvhN9DFv07v06Z9T84iteufDQuxnF5Xx+MoVE27fHvkc+5Lfl92YvejWLaNwpCVJC4AxLZaNza1KsB2vYn++uTe2tRmD3pdpIgkb8w6j1eDUfYXXsdg3D5f7cckwlhoABCgTEQT2BzotlWCrSnzIhl9FZbvfirxaUkdHVPMfJPbRPuZmq8xLcshhmmJ9gzzxg8ZY8sheF+0G4VHwEl1LxE0hBAJjoXUMMKAImTB3kZePw= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d3bb4697-e9ca-4649-a0ea-08d69294be50 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:42.3620 (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: MWHPR11MB1472 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075501_135913_7A19924F X-CRM114-Status: UNSURE ( 9.72 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea In at91_pm_backup_init() return if it is not about SAMA5D2 SoCs. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index e42db02eafe4..c83f78000ab3 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -588,6 +588,9 @@ static int __init at91_pm_backup_init(void) struct platform_device *pdev = NULL; int ret = -ENODEV; + if (!IS_ENABLED(CONFIG_SOC_SAMA5D2)) + return -EPERM; + if (!at91_is_pm_mode_active(AT91_PM_BACKUP)) return 0; From patchwork Thu Feb 14 15:54:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813095 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 C75DB1390 for ; Thu, 14 Feb 2019 15:55:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3B702EB41 for ; Thu, 14 Feb 2019 15:55:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7C542EC86; Thu, 14 Feb 2019 15:55:43 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 37BE22EB41 for ; Thu, 14 Feb 2019 15:55:43 +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=y5p/4dwSdT3UdtsO28Gf/27g+kB4WOoQ4oQJyGOPT/E=; b=i3QszjktKcPN+J la7BfUHkMrZzY1QGmUa/71ZAPu/GsAar8qzjTJmez6YLyrjr5Y0Jj8ki5QHvcqAkdtmXXeFeIzN0/ KRza4WElQfpWh78NnE6h9bBuCFt6wAhlWRLxY1GI1BuSmNoq9ksiZNJhovxtU6Iwe/oVit0Tf0uWr vex8XS6BrBZGiBM+rcB8K0OSxJlVWOfSBcWOcR7uRPKUp0UAAwkDmm0jNSImBNNCFSN9askcRDyNC m6wrb9nVHiaXvAeWEYKarU+ykwZSvKgfUdxbYIGlFIQtq7Pp7YqT3+Z2aXCGUDKcDkXyYaElDJpZ4 WF4/scKm3tLHgLWjXemg==; 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 1guJMT-0007pG-Cv; Thu, 14 Feb 2019 15:55:41 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJLm-0005rA-E9 for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:55:07 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="26565218" 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; 14 Feb 2019 08:54:54 -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; Thu, 14 Feb 2019 08:54:53 -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=UxvJskMUc7UwZVt/Jk3ZV4jjrDzNjlcr8v5Nx7uxB+4=; b=FoMA7bVjnA5B3JnCXUEYz3i/YxI8vj+EznBMaV9DvB6NBlRuGBw4Oj4UT0rVeYe3yTwE3+MNZzoDJR8y2cICIezlWTMqAht8yjyWy60KnJVB3K0AHXGSP+zV8kJx1OoShFL6aHOJws+q2uamNDgdrGrLx+8g8M9S9bHuX9efHsI= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB1472.namprd11.prod.outlook.com (10.172.53.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 14 Feb 2019 15:54:52 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:54:52 +0000 From: To: , , , , , , , Subject: [PATCH 5/8] ARM: at91: pm: add support for per SoC wakeup source configuration Thread-Topic: [PATCH 5/8] ARM: at91: pm: add support for per SoC wakeup source configuration Thread-Index: AQHUxH2fcSUQrSNGs0mRnpHh/9aZYg== Date: Thu, 14 Feb 2019 15:54:51 +0000 Message-ID: <1550159642-26878-6-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 91008001-3219-4b52-f84e-08d69294c148 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1472; x-ms-traffictypediagnostic: MWHPR11MB1472: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB1472; 23:Vn7/dUe3+6tI/xO87R7g52pkmH45U1ZcNKMsmS1?= =?iso-8859-1?q?zM+MNFlBgjtqbTB?= =?iso-8859-1?q?g12/IaLNvI8xpQXbXsjYbCxj5SvB4n9EcC6b0jdf6M7B1ZBldNbbCLjtUYf4?= =?iso-8859-1?q?ovukVbsGVRvIcMuqJlHIfAI9GL1U1bkKJ3Blabzjjiwr4zl8V/k2SgtfRZE9?= =?iso-8859-1?q?oK9xdkEX5CTkmvo56k+oHDgcc1U45iUpe0WGxXlSoboW5uF/4l+DRfL/0HQ1?= =?iso-8859-1?q?cT8PBX9oEiTy8wyedHM4QfxJkRubMePvZfdDb3b56+YlfNRCWor64Wx093t5?= =?iso-8859-1?q?LbUdxPxz2muHtgH/hrZWXum9nLPTs1kdmOae47ArZUD9JOABTUoonLaGIZ7U?= =?iso-8859-1?q?nDJPbFTgFHSezkZVRq3yUuxF/AWr5teH3nD23VQkhKbB1zeuEF+75RRn70Fr?= =?iso-8859-1?q?w6Jfl5/FErML59le/3PMzuww8cu+MHktMXVAWz42R6iRGV4JZcqvOTU7gfrM?= =?iso-8859-1?q?Sg2UwBp9uICAOAeHd0kHpOZXxgNI4QGNv7fmiAmlJIAA1HuHQgLikYki8h6Q?= =?iso-8859-1?q?KCG/H19DIBftstF7Ap3bcsvCTupWLqfDJ3I6Ee3XosnfBhaZ/RAhFgGjaURa?= =?iso-8859-1?q?/A5Q4QNZHafkK3ZMzZhvEyPZXXzL2FnyiAvyNgxhXxGqgvg/Xzl3J08N6vZI?= =?iso-8859-1?q?IKc9gS73IrM6aXGgmJwcb6Y4slHUCb6ajdippUamwYgRSDgkBf7sQiNyHiIj?= =?iso-8859-1?q?8hq1hEl+hMCN/vUU3iTSYOqxDKYwZURl+UtLzsZjxYdXoFRcAqrWu+N8hc41?= =?iso-8859-1?q?t/f/uQxfsRGkZTJWBpjmIwk1TTl18FJjMUGTgwmdzYDE1Kpw2q5xola1y4z8?= =?iso-8859-1?q?D5CQU5Y5FsIdk+QbrD7RZmVDGyVKZcYz48QZP82v7dM4FyLyLDMZQ9nWGgA0?= =?iso-8859-1?q?u+OKY25bPoxeAwqnb3+5vgEYNOa+fQTmtLMeEdA0X6NGfL3bIO31Z9eDpdPi?= =?iso-8859-1?q?Nw83aHa8iMM+lIMjVhHW4D5SWkHeOwdxj/OMWMtF1Ll67HfS0iUod4tnhLvc?= =?iso-8859-1?q?SJG4SlOp4UIwIoRoquPp4Nyb0OLMzRFkz0cCG/W33NIbe2yCdKrrwAPoceeR?= =?iso-8859-1?q?GhTlnyBcq+OSp9ctaiJSy/NcBPeFKEWoKYMjYCo/tPS3ypj3/tTX9CDO1/Zs?= =?iso-8859-1?q?hP+gnXniWsmNoYG2qGcMnwUS5Nc4dUk0TqP/MNmXw5UEBmgobS8wlgj4vZYr?= =?iso-8859-1?q?twPIpQKCdfQFIbtCA3zNt0U1qQeexQ2upEAlFpxkpYvvLoVmzVBMl2bHrS/1?= =?iso-8859-1?q?AHvbd+v+gP2ptM28hQwHqL7wDb?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(366004)(136003)(39860400002)(189003)(199004)(50226002)(478600001)(52116002)(2501003)(110136005)(25786009)(316002)(66066001)(8936002)(2906002)(8676002)(72206003)(68736007)(4326008)(54906003)(76176011)(81166006)(99286004)(6512007)(256004)(81156014)(305945005)(7736002)(6486002)(6436002)(26005)(186003)(6506007)(476003)(106356001)(105586002)(7416002)(14454004)(446003)(6116002)(102836004)(386003)(11346002)(97736004)(2201001)(71190400001)(107886003)(71200400001)(3846002)(86362001)(53936002)(2616005)(36756003)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1472; H:MWHPR11MB1920.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: uoqtuH0EC7+3uTKbEyv98LLU4bdirm9XpiLbAr9BZIRt+Luo6ppHLbzaa/wF752iEtdysur2sQHFIU0D5xtZQlMGYrIzgkf+52UXY6xGVQ027qr1QQ0LzWgwZcqBbfoYu9+pMX2jjKjiru2DtVQFrSdB5EeVCx6otCw2+1jrbjMNxrUzRw+VM+Yo3Y0SDQFBE4IvovbnUkky02rVSFO29p85I1/QynUN6OGZ/FX6xRWV56T484PEFS0dUwpSz/iNxcJKiJgxL7sJmEgXOJmGRUYbHwJdMWZRE5/Mxim98ofJI72pcmVNIEnDUCZPHT8s/cQhZcnyG1Anc82NACJotG5n1xWacSqqsufoBo9qGZ88sYPUE9zN5xbrmvXnRC47IDKIw6XW2vQ0hVnJJyTby/gGShCkT87VESvGSIN26O4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 91008001-3219-4b52-f84e-08d69294c148 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:47.3830 (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: MWHPR11MB1472 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075458_778202_D7D3BF7C X-CRM114-Status: GOOD ( 13.11 ) 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea Add support for per SoC wakeup source configuration. In this way we could have per SoC wakeup sources, shutdown controller and power management controller configurations for ULP1 power management mode. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index c83f78000ab3..27264caa4ec6 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -40,6 +40,9 @@ extern void at91_pinctrl_gpio_resume(void); #endif struct at91_soc_pm { + int (*config_shdwc_ws)(void __iomem *shdwc, u32 *mode, u32 *polarity); + int (*config_pmc_ws)(void __iomem *pmc, u32 mode, u32 polarity); + const struct of_device_id *ws_ids; struct at91_pm_data data; }; @@ -122,7 +125,7 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) if (pm_mode != AT91_PM_ULP1) return 0; - if (!soc_pm.data.pmc || !soc_pm.data.shdwc) + if (!soc_pm.data.pmc || !soc_pm.data.shdwc || !soc_pm.ws_ids) return -EPERM; if (!set) { @@ -130,16 +133,14 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) return 0; } - /* SHDWC.WUIR */ - val = readl(soc_pm.data.shdwc + 0x0c); - mode |= (val & 0x3ff); - polarity |= ((val >> 16) & 0x3ff); + if (soc_pm.config_shdwc_ws) + soc_pm.config_shdwc_ws(soc_pm.data.shdwc, &mode, &polarity); /* SHDWC.MR */ val = readl(soc_pm.data.shdwc + 0x04); /* Loop through defined wakeup sources. */ - for_each_matching_node_and_match(np, sama5d2_ws_ids, &match) { + for_each_matching_node_and_match(np, soc_pm.ws_ids, &match) { pdev = of_find_device_by_node(np); if (!pdev) continue; @@ -161,8 +162,8 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) } if (mode) { - writel(mode, soc_pm.data.pmc + AT91_PMC_FSMR); - writel(polarity, soc_pm.data.pmc + AT91_PMC_FSPR); + if (soc_pm.config_pmc_ws) + soc_pm.config_pmc_ws(soc_pm.data.pmc, mode, polarity); } else { pr_err("AT91: PM: no ULP1 wakeup sources found!"); } @@ -170,6 +171,27 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) return mode ? 0 : -EPERM; } +static int at91_sama5d2_config_shdwc_ws(void __iomem *shdwc, u32 *mode, + u32 *polarity) +{ + u32 val; + + /* SHDWC.WUIR */ + val = readl(shdwc + 0x0c); + *mode |= (val & 0x3ff); + *polarity |= ((val >> 16) & 0x3ff); + + return 0; +} + +static int at91_sama5d2_config_pmc_ws(void __iomem *pmc, u32 mode, u32 polarity) +{ + writel(mode, pmc + AT91_PMC_FSMR); + writel(polarity, pmc + AT91_PMC_FSPR); + + return 0; +} + /* * Called after processes are frozen, but before we shutdown devices. */ @@ -796,6 +818,10 @@ void __init sama5d2_pm_init(void) at91_pm_modes_init(); sama5_pm_init(); + + soc_pm.ws_ids = sama5d2_ws_ids; + soc_pm.config_shdwc_ws = at91_sama5d2_config_shdwc_ws; + soc_pm.config_pmc_ws = at91_sama5d2_config_pmc_ws; } static int __init at91_pm_modes_select(char *str) From patchwork Thu Feb 14 15:54:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813113 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 DC8391399 for ; Thu, 14 Feb 2019 15:58:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8F152ED07 for ; Thu, 14 Feb 2019 15:58:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC0B92ED1B; Thu, 14 Feb 2019 15:58:45 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 3868B2ED07 for ; Thu, 14 Feb 2019 15:58:45 +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=sqtOUY4TXN8NewWx0eK0ij++Os38Ua4SvY/vT93eM40=; b=a4IEKZS8sj8ppy xcp1YmNmpRF5k1b1qXZb2Sn+eAXMiJnIH3CiVNUh5MFwi/Wp/qWOBXzModFhdyhmNvIj9XCkOu/c6 CZJlFsOnvrkLlFQFsWi/3HrrG9a5vTZPDE8G6re1oMgrqbt3u8OIogKKlH95B+C0qXhq3bsSMMJo9 OhPCHSyDQfoc2sw18cAcP3HYpdZEHXlbWEm8MHCpyxEj//fxYFBAJKIay75M7pJx52CdMW5k/ASyQ 45z6faXJrJdc8LG+r85vBQgW0H0V3+CllcZbF7Sv+WuEDFbgEXep3dRJqkX6he65jxBLtfU9mqILM mpKlK3gddBWX6LMGgyyg==; 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 1guJPL-0001rg-3c; Thu, 14 Feb 2019 15:58:39 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJPG-0001r5-Tg for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:58:37 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="26282615" 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; 14 Feb 2019 08:58:30 -0700 Received: from NAM02-CY1-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; Thu, 14 Feb 2019 08:54:59 -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=/jCBcqsRwjIM07nNLPQYFr06+xQGEPsUG7q4ai/eXgg=; b=TrQk11sgoOpcV/GXccrqc59+j3RDUx6LbBwu1n3kBLIC+it8fft0uUheH9ODgKmO5ixd1D3vwe3CjN6ifRZvNdMdhvYu09kmoSrEdOZo78zEvF5qM3mErjckO9hoXrOWt4mvP74fPOnpKD+TUiGhUmG4itlhskBe2taww8t7NtQ= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB2031.namprd11.prod.outlook.com (10.169.236.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.17; Thu, 14 Feb 2019 15:54:57 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:54:57 +0000 From: To: , , , , , , , Subject: [PATCH 6/8] ARM: at91: pm: add ULP1 support for SAM9X60 Thread-Topic: [PATCH 6/8] ARM: at91: pm: add ULP1 support for SAM9X60 Thread-Index: AQHUxH2i/1SZGNr49EScTe5mg81JaQ== Date: Thu, 14 Feb 2019 15:54:57 +0000 Message-ID: <1550159642-26878-7-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d35de275-e0bb-4c03-9143-08d69294c452 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB2031; x-ms-traffictypediagnostic: MWHPR11MB2031: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB2031; 23:oqxcaEAIHh2yjkRpqmh0XzsKsT9uAQ/dtYCh48V?= =?iso-8859-1?q?hIQ6Nk6uM2cIYRs?= =?iso-8859-1?q?Q2VFQIYHfG0Qz6r/pUjxO4IJDLhahgyVbqR18GaPJGwFvMSbZmyNc3+vo1zY?= =?iso-8859-1?q?Bs5BXzpSCsRKbHyPrlrs5bqQCsFrzcw3/53ppXV4cPPyC2fd+bzdI1iW7RQ+?= =?iso-8859-1?q?EEuh+Pl8qZprf6yyHQ321rzrKcObx1NppneQWbNLyrQz9BET8fw1TMr0hDGg?= =?iso-8859-1?q?lrp8XFlvngLPuC/JYzj6JZQ2kraB8y/i21D748CnU8BgoGtRmKDD5DZDso+0?= =?iso-8859-1?q?l1AHplQxSHOaEcGUFBIXfOCxSHLcg6zih3x0X5FPIf/nyTsWWd9BeDXa0gWc?= =?iso-8859-1?q?lLVmuhcnTEa04OW4SH5sKXSMG0mJL7W/3jVeScoI/fTPosDKi8uug2jqunoT?= =?iso-8859-1?q?oUSnzMe9xM0iUyW8Pcy44xLjbfOANm7Fdgjdu3Fi0oQhcaSR/7rox0cOz2Ut?= =?iso-8859-1?q?+N8rjALhOJNERMJjarJbpA5jxkoaH8lylYVj39dbTJbv+52TV2RjmlgyZArH?= =?iso-8859-1?q?BBlQ88sI7bdMTI1ItJQcrOONxXsXoaijiosLo1n5qKb8a8DWwdHb7jXlAUzY?= =?iso-8859-1?q?GK1FcePeOUtDtkPTBfASKJS++tmRJ+IMykh5IarGsTOmLDL3Q35hMxL4ljHp?= =?iso-8859-1?q?FD6l6IkB6NlYZeSbHuUgFcNADOe8H8g3wiJt3P3pRJrlIC64/r+IisNyU9qI?= =?iso-8859-1?q?tfhjwujQqiUK0RFvjaiy7B8a0k9nq5LDZwPXLksJcAMfLnV/2QgV/KiMzv7f?= =?iso-8859-1?q?i/NlenNnW9U1FRdTnFLyWtgSzFQiOKeXAoiWbyrBsCJnuJ0QU8PzB0rGKxq/?= =?iso-8859-1?q?TcR83jTMQ+Tm8fZRGSRwR70RaHZ2vlUKRmN6EaIVSudwDQjcJ+EL1A7KAskD?= =?iso-8859-1?q?pwlESIa9euCKmBwIgyfXInRI90CQWm/24BT4mhfaf3sZD3F2xC38ZKZSexF8?= =?iso-8859-1?q?GsE6VxY7vd306NcuFEv3ZPZ6Txcry6rMXdfINkf9Tc/cBKOPHeBMfSKsShce?= =?iso-8859-1?q?bQy95U21IeQdaNZhAGAocEAgNb46+dTw81NJQZ0644qhF2r0obwRzilslEZd?= =?iso-8859-1?q?SHhV3AIzYnaq8vPcrl09xjAudHRFCtVJGc8i18lMh0SzjZBkyLRpejfNbDk0?= =?iso-8859-1?q?Cd3Yb0wArjg88WdmNoak0ygWfSf99b5NIatVouEi0tSrJUadGyw/fvzAeZto?= =?iso-8859-1?q?4MvSr3T5lLiVgeyjN93vxEVnZhYXOoWb2PA84nLOmhThpNUCMSCXtUBfWjZO?= =?iso-8859-1?q?L4jmlDnuL7hq0Fgy1G1XrZXMY+2TTgg98jv5/CNLYQJBaNM/0qzAneonRWLj?= =?iso-8859-1?q?CHkyyNe2c=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39860400002)(136003)(376002)(366004)(189003)(199004)(97736004)(6486002)(2906002)(72206003)(14454004)(478600001)(81156014)(36756003)(2501003)(71190400001)(71200400001)(316002)(81166006)(7416002)(110136005)(54906003)(6436002)(76176011)(66066001)(50226002)(14444005)(256004)(6512007)(106356001)(8936002)(68736007)(52116002)(2201001)(26005)(186003)(446003)(53936002)(11346002)(6116002)(7736002)(3846002)(25786009)(107886003)(4326008)(305945005)(99286004)(8676002)(105586002)(486006)(86362001)(386003)(476003)(6506007)(102836004)(2616005)(357404004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB2031; H:MWHPR11MB1920.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: aHV6p3dJPsztkezn3d/jvqsYXLcuoSAP4vrycL3gO3Y4eCLNGgQdUb3rajV4fzuyruBukY6HEWty1lUtoWoRIGSU8VcHpIshIl93EiKDRBKmIdB26uMh03r2rR5k3G3RPlUlj82nyg+p//+kXFSacBj4ORz3dbQatKN4j1Nm2MyhsvKTL6Z6EK8Wr1rxwKLSjbnGNKvM9V/ep5Cf3yXkjt51mumJeqVV4SwxItvCEIAYZmLF7Ehs3k9+G3b2YJWyiTnEZ2w0QHGzp5pypbo3iLT5m+skwme12oozfWXBnfDnCMTQijJDCi6dNWdK4K+ptI6SHjrPDv5FMNgr62EJHuYiWv2CAkIgZUw2IRG4q79y6/AgfPw03wftsFFIEKE29eJuaXbdU6W0OuoCS8Jzd9xuv1W4UBMO1u9LTjPaM8Y= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d35de275-e0bb-4c03-9143-08d69294c452 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:52.4100 (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: MWHPR11MB2031 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075836_031283_1F455CC0 X-CRM114-Status: GOOD ( 14.00 ) 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea Add ULP1 support for SAM9X60. In pm_suspend.S enable RC oscillator in PMC if it is not enabled. At resume the state before suspend is restored. Signed-off-by: Claudiu Beznea Acked-by: Stephen Boyd --- arch/arm/mach-at91/pm.c | 24 ++++++++++++++++++++++++ arch/arm/mach-at91/pm_suspend.S | 41 ++++++++++++++++++++++++++++++++++++++++- include/linux/clk/at91_pmc.h | 1 + 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 27264caa4ec6..5571658b3c46 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -100,6 +100,8 @@ static const struct wakeup_source_info ws_info[] = { { .pmc_fsmr_bit = AT91_PMC_RTCAL, .shdwc_mr_bit = BIT(17) }, { .pmc_fsmr_bit = AT91_PMC_USBAL }, { .pmc_fsmr_bit = AT91_PMC_SDMMC_CD }, + { .pmc_fsmr_bit = AT91_PMC_RTTAL }, + { .pmc_fsmr_bit = AT91_PMC_RXLP_MCE }, }; static const struct of_device_id sama5d2_ws_ids[] = { @@ -114,6 +116,17 @@ static const struct of_device_id sama5d2_ws_ids[] = { { /* sentinel */ } }; +static const struct of_device_id sam9x60_ws_ids[] = { + { .compatible = "atmel,at91sam9x5-rtc", .data = &ws_info[1] }, + { .compatible = "atmel,at91rm9200-ohci", .data = &ws_info[2] }, + { .compatible = "usb-ohci", .data = &ws_info[2] }, + { .compatible = "atmel,at91sam9g45-ehci", .data = &ws_info[2] }, + { .compatible = "usb-ehci", .data = &ws_info[2] }, + { .compatible = "atmel,at91sam9260-rtt", .data = &ws_info[4] }, + { .compatible = "cdns,sam9x60-macb", .data = &ws_info[5] }, + { /* sentinel */ } +}; + static int at91_pm_config_ws(unsigned int pm_mode, bool set) { const struct wakeup_source_info *wsi; @@ -192,6 +205,13 @@ static int at91_sama5d2_config_pmc_ws(void __iomem *pmc, u32 mode, u32 polarity) return 0; } +static int at91_sam9x60_config_pmc_ws(void __iomem *pmc, u32 mode, u32 polarity) +{ + writel(mode, pmc + AT91_PMC_FSMR); + + return 0; +} + /* * Called after processes are frozen, but before we shutdown devices. */ @@ -789,8 +809,12 @@ void __init sam9x60_pm_init(void) if (!IS_ENABLED(CONFIG_SOC_AT91SAM9)) return; + at91_pm_modes_init(); at91_dt_ramc(); at91_pm_init(at91sam9x60_idle); + + soc_pm.ws_ids = sam9x60_ws_ids; + soc_pm.config_pmc_ws = at91_sam9x60_config_pmc_ws; } void __init at91sam9_pm_init(void) diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index bfe1c4d06901..8b18cad1dcf5 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -197,8 +197,26 @@ ENDPROC(at91_backup_mode) .macro at91_pm_ulp1_mode ldr pmc, .pmc_base - /* Switch the main clock source to 12-MHz RC oscillator */ + /* Save RC oscillator state and check if it is enabled. */ + ldr tmp1, [pmc, #AT91_PMC_SR] + str tmp1, .saved_osc_status + tst tmp1, #AT91_PMC_MOSCRCS + bne 2f + + /* Enable RC oscillator */ ldr tmp1, [pmc, #AT91_CKGR_MOR] + orr tmp1, tmp1, #AT91_PMC_MOSCRCEN + bic tmp1, tmp1, #AT91_PMC_KEY_MASK + orr tmp1, tmp1, #AT91_PMC_KEY + str tmp1, [pmc, #AT91_CKGR_MOR] + + /* Wait main RC stabilization */ +1: ldr tmp1, [pmc, #AT91_PMC_SR] + tst tmp1, #AT91_PMC_MOSCRCS + beq 1b + + /* Switch the main clock source to 12-MHz RC oscillator */ +2: ldr tmp1, [pmc, #AT91_CKGR_MOR] bic tmp1, tmp1, #AT91_PMC_MOSCSEL bic tmp1, tmp1, #AT91_PMC_KEY_MASK orr tmp1, tmp1, #AT91_PMC_KEY @@ -262,6 +280,25 @@ ENDPROC(at91_backup_mode) str tmp1, [pmc, #AT91_PMC_MCKR] wait_mckrdy + + /* Restore RC oscillator state */ + ldr tmp1, .saved_osc_status + tst tmp1, #AT91_PMC_MOSCRCS + bne 3f + + /* Disable RC oscillator */ + ldr tmp1, [pmc, #AT91_CKGR_MOR] + bic tmp1, tmp1, #AT91_PMC_MOSCRCEN + bic tmp1, tmp1, #AT91_PMC_KEY_MASK + orr tmp1, tmp1, #AT91_PMC_KEY + str tmp1, [pmc, #AT91_CKGR_MOR] + + /* Wait RC oscillator disable done */ +4: ldr tmp1, [pmc, #AT91_PMC_SR] + tst tmp1, #AT91_PMC_MOSCRCS + bne 4b + +3: .endm ENTRY(at91_ulp_mode) @@ -475,6 +512,8 @@ ENDPROC(at91_sramc_self_refresh) .word 0 .saved_sam9_mdr1: .word 0 +.saved_osc_status: + .word 0 ENTRY(at91_pm_suspend_in_sram_sz) .word .-at91_pm_suspend_in_sram diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h index 931ab05f771d..bd3a65c0bad3 100644 --- a/include/linux/clk/at91_pmc.h +++ b/include/linux/clk/at91_pmc.h @@ -159,6 +159,7 @@ #define AT91_PMC_FSMR 0x70 /* Fast Startup Mode Register */ #define AT91_PMC_FSTT(n) BIT(n) +#define AT91_PMC_RTTAL BIT(16) #define AT91_PMC_RTCAL BIT(17) /* RTC Alarm Enable */ #define AT91_PMC_USBAL BIT(18) /* USB Resume Enable */ #define AT91_PMC_SDMMC_CD BIT(19) /* SDMMC Card Detect Enable */ From patchwork Thu Feb 14 15:55:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813105 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 5BE911399 for ; Thu, 14 Feb 2019 15:56:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48F242EC8D for ; Thu, 14 Feb 2019 15:56:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CDB02EC97; Thu, 14 Feb 2019 15:56:45 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 D89362EC8D for ; Thu, 14 Feb 2019 15:56:44 +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=M64HIIr5heSuAXKzSxHRRXXP8iRL99J6M1JAZx+cWo4=; b=nhske3wneWQEPZ n6PrhFYoQUo0l/vsRApgEq9kA6mUjopoQPXyF9l+Z7XsJAJs9yUZ0bq74wVAoMSQjzpJmPa398x1k q76zygGa+tSKxPl9PYIjO+TdMKC3QOCey01inEVccYrwZ0004DkFiIRq9WXy17xQdCPBS1u5CSvRt dXsvALKGZ1CQJ0VYC4fAsbx5Tt/4m/B6422BNJVfK3ySaBDsW0Ev2l/0tIsQHDybPeqDoFhB7Lruj o7y7AS9W7mzt05UYRJ/yy8bwRuJ0rPZlQsLFgvrG1maGhQ2FMW2Q3xsrBXfeFMZCFsE/U4bnG7g1W Y4a0HN/A/NPGo0nkuKsA==; 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 1guJNL-0000Ic-Lh; Thu, 14 Feb 2019 15:56:35 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guJM1-0006YR-3j for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:55:27 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="26282421" 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; 14 Feb 2019 08:55:06 -0700 Received: from NAM03-CO1-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; Thu, 14 Feb 2019 08:55:03 -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=pIZdKQ2EzTzxbQhcuVuQ7U2CsVi9pOiHu0nvpIQ4lWE=; b=UynpPyWV6/1iGlJsWwugt1litOzVpdIgy8PU+qpKu+khZkjGUW2ai1Qr2MB1wJ5Kp8gCQzAmobfJgCTPz4Bj2snDCibiOQqtj3WbDY8iyLtAGMqiPrlpeMir48tmrapdrIbR+7L5sEAD8Lw8Jioa74hhlLH7qy/lylDKLGP2Aj0= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB1472.namprd11.prod.outlook.com (10.172.53.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 14 Feb 2019 15:55:02 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:55:02 +0000 From: To: , , , , , , , Subject: [PATCH 7/8] ARM: at91: pm: disable RC oscillator in ULP0 Thread-Topic: [PATCH 7/8] ARM: at91: pm: disable RC oscillator in ULP0 Thread-Index: AQHUxH2lts6UkE7B20KVlk1mwuX6kw== Date: Thu, 14 Feb 2019 15:55:01 +0000 Message-ID: <1550159642-26878-8-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: dba91b8a-da64-4c4d-6f9b-08d69294c74c x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1472; x-ms-traffictypediagnostic: MWHPR11MB1472: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB1472; 23:ntkH42UepusqBcJ0xY7Z1znfz7Wvw2SvlRK7Gdr?= =?iso-8859-1?q?AvJkZeLBsGaNjVE?= =?iso-8859-1?q?0iJUm7mDfcNFNmSQkciGpgyh3/wOnOhGjRBc1K40v+uMBUrTlvJnQN70u/3u?= =?iso-8859-1?q?CRHeXxd1vObO3USpvkBJnKNazEBHOvynXO5BEs8EaY73oG9C8HygzGY1AoMc?= =?iso-8859-1?q?/7VmzCoRRGKP98G94oo5PfqHqASWrPdrmXRSDL+ffMgOMuiJln8YEwT4BSEe?= =?iso-8859-1?q?nzFc6q/LPOOSgKhzm90UKvm1zdiiVY0iHyAmP9NVHJKKQYkXsLWR7XmlYVv2?= =?iso-8859-1?q?+zHN1+U+g/ONphgnV5N8u2lz6AhIbxuESbWxmRLAMLDXuVGfJecErZYY7+yP?= =?iso-8859-1?q?GHVaSJIsczssjzD+U8+0tzsOMf6pxtMuR6Yce4LdnMHW3QAcnKZueqDWCvJB?= =?iso-8859-1?q?yvHBzYPVdKfj/Ruc+XJUEOrEXcnZ/QY5aWDwbqWmSIKL4q3YcS3dJFmhDLbW?= =?iso-8859-1?q?OlVWfPntfkXujmsggtWBkaiVCaTYOnKy7r4spRTd6flVR3xM/EBVSPKZZmQL?= =?iso-8859-1?q?hV9viK1+tEKRhi8y0+KBpHxY4xcWAZx0+/h6j2/8P/hOOj7DnsS0YHxFfGUP?= =?iso-8859-1?q?t19I5oJnN+K1dy1TLcPKkL8W6MckcAvBj49driW5o9VoNyuHTx17g8sG+qz5?= =?iso-8859-1?q?2j0XlfVJNgb+4SIx76Whk0ogTdQrmMr+2Oli+hd70uTFGpu0zEuqdjXJNoiH?= =?iso-8859-1?q?csZQkYw8HXdz4ZSW89TLsWtJV1sqhvGRizpBXqMZuzmQO7195O6JJMxMhF4u?= =?iso-8859-1?q?G8Japc0U3ZoqOZ6GVu/MuGmjoPVZjrG/7kp5RTqoGNREqTMsoUKnBuCEmHuq?= =?iso-8859-1?q?akUSTWv2kviYJqChsyh5zRgVUFyig2HTFFiZTcBNt11UvjS97H+7OnsvnkLI?= =?iso-8859-1?q?lyPbezR0EnZdRJ9njp7bDZKeCjRBZQYO2N6ScAnuKwGlSE/BMbtO+W6TxHYY?= =?iso-8859-1?q?tOvJP85B9E1bhLyfRZOyb80U7DohSR/HYzOzYA+Q/rlww/xltGrMIz2k7f6y?= =?iso-8859-1?q?uWrvzj7ZArfh5EDMCnAQ3RSGKPge/0w+alGFFsFpJC0Cj6b3OCobGnf/6Smk?= =?iso-8859-1?q?0nkAst0OFMQqGqLMRj8cG5FYW6ZSqjp8LM3imFDSRlBT+vxERmuV5c4MZpNo?= =?iso-8859-1?q?EwlVeis8AWY93Dh5nCecdXhDZeDGYZw2/tLhcz6XAHIDKu7zKtTlA3Pay6dK?= =?iso-8859-1?q?T9X63Ig/HO17SsPsus/Xrt+FE/5548vDKvJM7f/af/5LoHVY//auqVAZzCw9?= =?iso-8859-1?q?ulLmpLtETfxiIaHgQmr0/8mCaIwNgwhUK/6pwguvzklFdFYIZRz3kcZbaL/V?= =?iso-8859-1?q?59F+GaiL8j3D5WpAa00y20k2oJ9EGO2yHihP9fXWOmvptaTdw6i6S9cs54of?= =?iso-8859-1?q?9cOO9NzutKvh1Yadrd5RdJRPxI95CLuWF7?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(346002)(396003)(376002)(366004)(136003)(39860400002)(189003)(199004)(50226002)(478600001)(52116002)(2501003)(110136005)(25786009)(316002)(66066001)(8936002)(2906002)(8676002)(72206003)(68736007)(4326008)(54906003)(76176011)(81166006)(99286004)(6512007)(256004)(14444005)(81156014)(305945005)(7736002)(6486002)(6436002)(26005)(186003)(6506007)(476003)(106356001)(105586002)(7416002)(14454004)(446003)(6116002)(102836004)(386003)(11346002)(97736004)(2201001)(71190400001)(107886003)(71200400001)(3846002)(86362001)(53936002)(2616005)(36756003)(486006)(357404004)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1472; H:MWHPR11MB1920.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: eYdlKDsmIAyVWdD0I/Oicxxvu0nx8j6XLpUg/zu6sIuggieIrzM5VaSHm7y8MFispXR52oaS8jYaLumGB/XgCePGIOoilwTNwoeqiw+eYICX4FILveKE/543ucFG21r/EyzcJhsPQLmOptumGBGgstEh8TD5uztWUlZrKf3rI7Mc6zbHIB1+fbsM/aUee0e0nwyC3isXwYhbwpJldOHZLaAgQ2AZmweBUhVlCkRqOyiZODCijG50vSPnqvDzyzrgHGcljp0+6eDS+4jXJk8D2b2S126Ug/cw9zIT/8kHEI5hxJGNAqZZNX3mUHSVPFGhxS9d+KxvTQM6CMFLI9JA0DEShrsr5Nc2Gb6CiaPpFONFgTYeliT7726Syltnmzs6qg08FWFZ/ucOrSf3kNuT4adSrweP2NqtSGKN1G3RCHk= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: dba91b8a-da64-4c4d-6f9b-08d69294c74c X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:54:57.4531 (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: MWHPR11MB1472 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075514_130952_65A17BB4 X-CRM114-Status: UNSURE ( 9.16 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea Disable RC oscillator in ULP0 as datasheet specifies. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm_suspend.S | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index 8b18cad1dcf5..5c33023f9129 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -178,11 +178,46 @@ ENDPROC(at91_backup_mode) orr tmp1, tmp1, #AT91_PMC_KEY str tmp1, [pmc, #AT91_CKGR_MOR] + /* Save RC oscillator state */ + ldr tmp1, [pmc, #AT91_PMC_SR] + str tmp1, .saved_osc_status + tst tmp1, #AT91_PMC_MOSCRCS + bne 1f + + /* Turn off RC oscillator */ + ldr tmp1, [pmc, #AT91_CKGR_MOR] + bic tmp1, tmp1, #AT91_PMC_MOSCRCEN + bic tmp1, tmp1, #AT91_PMC_KEY_MASK + orr tmp1, tmp1, #AT91_PMC_KEY + str tmp1, [pmc, #AT91_CKGR_MOR] + + /* Wait main RC disabled done */ +2: ldr tmp1, [pmc, #AT91_PMC_SR] + tst tmp1, #AT91_PMC_MOSCRCS + bne 2b + /* Wait for interrupt */ - at91_cpu_idle +1: at91_cpu_idle - /* Turn on the crystal oscillator */ + /* Restore RC oscillator state */ + ldr tmp1, .saved_osc_status + tst tmp1, #AT91_PMC_MOSCRCS + beq 4f + + /* Turn on RC oscillator */ ldr tmp1, [pmc, #AT91_CKGR_MOR] + orr tmp1, tmp1, #AT91_PMC_MOSCRCEN + bic tmp1, tmp1, #AT91_PMC_KEY_MASK + orr tmp1, tmp1, #AT91_PMC_KEY + str tmp1, [pmc, #AT91_CKGR_MOR] + + /* Wait main RC stabilization */ +3: ldr tmp1, [pmc, #AT91_PMC_SR] + tst tmp1, #AT91_PMC_MOSCRCS + beq 3b + + /* Turn on the crystal oscillator */ +4: ldr tmp1, [pmc, #AT91_CKGR_MOR] orr tmp1, tmp1, #AT91_PMC_MOSCEN orr tmp1, tmp1, #AT91_PMC_KEY str tmp1, [pmc, #AT91_CKGR_MOR] From patchwork Thu Feb 14 15:55:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10813107 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 577AE1399 for ; Thu, 14 Feb 2019 15:56:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 448432EC97 for ; Thu, 14 Feb 2019 15:56:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 385EE2ECC0; Thu, 14 Feb 2019 15:56:47 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 D400A2EC97 for ; Thu, 14 Feb 2019 15:56:46 +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=UwRdGndy8p4COUjIHTAlrNfAZ9K25umIF2jz/Mkdzys=; b=EBNT6BZN3LTtrv cfJj0hKZx/fqO82X1Jt4DTAPHcWyqL/IFR9w++mqNC6p7ue85JZwqU89EOvs57FveRdbQBOFCn8d+ fQVn4VxUcTbpHR1TG9nzCXi1I3aDn5xCgC56sDwEVXSf0j8+woXGYl8T/o6NWUFUw/J8afKwQ4MfZ Rkv1XKKh0uzndx3fsSGyM9pgMtcgQKyJvMcKeiDbr0zKIzn6JQHDtDxYIQ6VwI15E9xOudgT7kT8q mubKoBIIyhyp1X5HR1yHQWFopTbQyqojUHpehhDGQ6KM0MDLZWvJqZZGocp0AHl1wc56F6jiKR/Gx 0oOufkYDFUet6LWLn91w==; 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 1guJNU-0000XD-AA; Thu, 14 Feb 2019 15:56:44 +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 1guJM3-0006kX-8D for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 15:55:31 +0000 X-IronPort-AV: E=Sophos;i="5.58,369,1544511600"; d="scan'208";a="26740823" 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; 14 Feb 2019 08:55:10 -0700 Received: from NAM03-CO1-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; Thu, 14 Feb 2019 08:55:10 -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=aRa/h1zYdTZeiJ05Ejj5rqzRvyQdmKUHvESAzkGGIds=; b=YWZVTdtjDne2vGUyGiPm5A+DXVjlO68WIktMY+o1PV0HCzWeU8pHmNik3m+U3jK506GxJBrGt2/wxvL/iwnIk7cAx7WYBgrcnQfmDe081vtUWku4JkutAv0lsncu/U6SJjZMXezzFRhXOUvjWVwrbMvpF/ugB/cohq8lrU59ucw= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB1472.namprd11.prod.outlook.com (10.172.53.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 14 Feb 2019 15:55:06 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::d917:8496:9d53:1f55%9]) with mapi id 15.20.1622.016; Thu, 14 Feb 2019 15:55:06 +0000 From: To: , , , , , , , Subject: [PATCH 8/8] ARM: at91: pm: do not disable/enable PLLA for ULP modes Thread-Topic: [PATCH 8/8] ARM: at91: pm: do not disable/enable PLLA for ULP modes Thread-Index: AQHUxH2nRJoXfPACgkOWEfGtZU7tFQ== Date: Thu, 14 Feb 2019 15:55:06 +0000 Message-ID: <1550159642-26878-9-git-send-email-claudiu.beznea@microchip.com> References: <1550159642-26878-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1550159642-26878-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: VI1PR0901CA0098.eurprd09.prod.outlook.com (2603:10a6:800:7e::24) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [213.233.85.122] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 83a06ccd-b288-4d9a-18e7-08d69294ca05 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1472; x-ms-traffictypediagnostic: MWHPR11MB1472: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB1472; 23:PbdwCgU7WpEgnqpxZW4PqoFell2pZ43Fag0VF5z?= =?iso-8859-1?q?ql5nBND69hkvSbZ?= =?iso-8859-1?q?BrZwP6u6esRnANbdY38ILzELbDFg9gb0XmxbYDDp01XvuMq7BCT2fkc/xH+C?= =?iso-8859-1?q?AOCGn8Qozy3B37Y1ByPJWI+f/n495KUL4gYAZ2VRobAe81oq1KDTWz78KXNz?= =?iso-8859-1?q?I3a7xuzEY7/2111axO454oc6053vjL3JPy9kCL/hWisb0zR6IbSmaJBHNK/g?= =?iso-8859-1?q?VStmrBAjCetETDjp9vgiJmJh2Xpi2Sl2Q3JVe9OgWKPqrIt0Gunyt0nJWlm1?= =?iso-8859-1?q?vUwtqk31zhWoIoEPGQAtyTHEPiOo2tHDLKUv33Zkhr4kObmcsW1qCUcY0/Je?= =?iso-8859-1?q?IuUszD+IF4EBqHpe8z/M+ZRyJOwpX5j9VNSQczo+NtYt9w5CTN6EbgTOTYcl?= =?iso-8859-1?q?xSEqGGzVLbSmuPezJNt28TS7ZC9NPSqYTCVqJ5M/8ettqg8UOgxEA1s3klqk?= =?iso-8859-1?q?cundec5OTNQ+pgPTgJ7gEs0o5vwb+mLOcBbXGnnMzY5uFOmlJ6fo+GMWb+8H?= =?iso-8859-1?q?f0tDfC2KVHd/zWkfXmTHnubpdrB+eGF6RQKfqsQJcCKFobKMaNihEqzWmeeh?= =?iso-8859-1?q?px2yiODE2WgO9Pl7iKTiT/uMIny1E5J6qRD4ZhsUqWI6oMNlhehM9o9Vr9cS?= =?iso-8859-1?q?I+yqPOmUO+Y6rKAg+3Ki+fkKME9IdcFBCwKEevlm3X1Y6A+hLLfnv5m1nSkP?= =?iso-8859-1?q?XecAur5h6aj7CZdpD4hWYsaDdZEvNtVA9NRE02Pxh0LKubEzDyQ7Bibhildd?= =?iso-8859-1?q?3JhXekO9K9HHnBW5WGdnqmId131TqXJfGomBgr7TFTxrsGuQMveweuApU03s?= =?iso-8859-1?q?e9Xix0A5qqXnLbBdqWN/nlMhyL1b/EkdmEmDcFv0jTJNWm0xz3DCvSCfVGrN?= =?iso-8859-1?q?zz2KrAicYhzygpIJ51uOdi0Csrl5B+sezgTvdAIwwOw0JnshdTWoJ37g6yA0?= =?iso-8859-1?q?pWaPsRYd4o1ZAKY3ks3xQVbJfPrP8xxd41lQ4iEcd6jwFMggYZ2vJEhR1j0J?= =?iso-8859-1?q?K9iLnY/DPgDA5GhanH1dDysTaitheF2uM0NVPXLV+iBHxEIrHAo3bRib0hCA?= =?iso-8859-1?q?NNoCRThvZbaZhywV3OrRETDZsb3hLyUicHp84EN78ktOthI2x86Qtl7jNCAh?= =?iso-8859-1?q?sBrYusDCaKPdDJKFKDHwdijXcAlE+5y2E5T3tMslu34QKWZbulflG0UiLdqh?= =?iso-8859-1?q?fR1dMrh1pnuU7C8nkyPXVcUyogWpdDF03ahJH6J4pyYfxy6UQC6QXNJnTL0Q?= =?iso-8859-1?q?BMGtFUtOo89/uvifF4I2HmYMC64XE5CZPBDLrTRhKBJWqiHZHBdQUIZCDG66?= =?iso-8859-1?q?KHGfYvq5I5fsDkMZK2xXQvlybhl1FA?= x-microsoft-antispam-prvs: x-forefront-prvs: 09480768F8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(366004)(136003)(39860400002)(43544003)(189003)(199004)(50226002)(478600001)(52116002)(2501003)(110136005)(25786009)(316002)(66066001)(8936002)(2906002)(8676002)(72206003)(68736007)(4326008)(54906003)(76176011)(81166006)(99286004)(6512007)(256004)(14444005)(81156014)(305945005)(7736002)(6486002)(6436002)(26005)(186003)(6506007)(476003)(106356001)(105586002)(7416002)(14454004)(446003)(6116002)(102836004)(386003)(11346002)(97736004)(2201001)(71190400001)(107886003)(71200400001)(3846002)(86362001)(53936002)(2616005)(36756003)(486006)(357404004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1472; H:MWHPR11MB1920.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: Csapf3tNHVgnLXfF4uobOhlOg7qTnSl56wgEvdPwsmQXF9xXQretvosl2YMoj2jTdosH5mndVJbYiVRteDxIdNV57Jhb3ouJGP/S5cfniyppJ3Wu+cIiT2m+1yhmrQ6uwwSeJkJvWSvycHE8diVB73BOX44bOtcHhIZ5lcAXwY4UJ8oTvW1lXWBmgNiwD7b7JBQsrNDK9fPawsjJzn92HuriaXWp8/qp98BaWk8/1tVvCo6SmUFYy+FPmralpozJeRgYYy2AjgdUBKcAwDlgTwb8HaIPlSZwNgu0N8ds8uxCTjmIFgmmcb2cIibam/mpW++hODIhfqPg3JiRjLV/FAq3KO8XRcFNEYfHNJE8/Nbpw/Qe69i8JxOId+VpVTQMvGkOUMk3TrXguCyrs3M78Ssfnd9yHPUHTeQ4304bZvo= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 83a06ccd-b288-4d9a-18e7-08d69294ca05 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2019 15:55:02.3410 (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: MWHPR11MB1472 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_075515_985744_68785F10 X-CRM114-Status: UNSURE ( 7.21 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@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 From: Claudiu Beznea There is no need to disable/enable PLLA when switching to one of the ULP modes. The PLLA consumers should take care of this. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm_suspend.S | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index 5c33023f9129..77e29309cc6e 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -51,15 +51,6 @@ tmp2 .req r5 .endm /* - * Wait until PLLA has locked. - */ - .macro wait_pllalock -1: ldr tmp1, [pmc, #AT91_PMC_SR] - tst tmp1, #AT91_PMC_LOCKA - beq 1b - .endm - -/* * Put the processor to enter the idle state */ .macro at91_cpu_idle @@ -351,14 +342,6 @@ ENTRY(at91_ulp_mode) wait_mckrdy - /* Save PLLA setting and disable it */ - ldr tmp1, [pmc, #AT91_CKGR_PLLAR] - str tmp1, .saved_pllar - - mov tmp1, #AT91_PMC_PLLCOUNT - orr tmp1, tmp1, #(1 << 29) /* bit 29 always set */ - str tmp1, [pmc, #AT91_CKGR_PLLAR] - ldr r0, .pm_mode cmp r0, #AT91_PM_ULP1 beq ulp1_mode @@ -373,18 +356,6 @@ ulp1_mode: ulp_exit: ldr pmc, .pmc_base - /* Restore PLLA setting */ - ldr tmp1, .saved_pllar - str tmp1, [pmc, #AT91_CKGR_PLLAR] - - tst tmp1, #(AT91_PMC_MUL & 0xff0000) - bne 3f - tst tmp1, #(AT91_PMC_MUL & ~0xff0000) - beq 4f -3: - wait_pllalock -4: - /* * Restore master clock setting */ @@ -537,8 +508,6 @@ ENDPROC(at91_sramc_self_refresh) .word 0 .saved_mckr: .word 0 -.saved_pllar: - .word 0 .saved_sam9_lpr: .word 0 .saved_sam9_lpr1: