From patchwork Mon Oct 20 12:56:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 5105441 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8CF73C11AC for ; Mon, 20 Oct 2014 12:57:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88EE120176 for ; Mon, 20 Oct 2014 12:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71F0B20166 for ; Mon, 20 Oct 2014 12:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752112AbaJTM47 (ORCPT ); Mon, 20 Oct 2014 08:56:59 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:52822 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbaJTM4q (ORCPT ); Mon, 20 Oct 2014 08:56:46 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s9KCu9nZ019300; Mon, 20 Oct 2014 07:56:09 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9KCu9Rr018131; Mon, 20 Oct 2014 07:56:09 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 20 Oct 2014 07:56:09 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9KCu8cS013391; Mon, 20 Oct 2014 07:56:09 -0500 From: Grygorii Strashko To: , "Rafael J. Wysocki" , CC: Geert Uytterhoeven , , Rob Herring , , , , , , Grygorii Strashko Subject: [PATCH v2 2/3] ARM: keystone: pm: switch to use generic pm domains Date: Mon, 20 Oct 2014 15:56:03 +0300 Message-ID: <1413809764-21995-3-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413809764-21995-1-git-send-email-grygorii.strashko@ti.com> References: <1413809764-21995-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch switches Keystone 2 PM code to use Generic PM domains instead of PM clock domains because of the lack of DT support for the last. Reviewed-by: Kevin Hilman Signed-off-by: Grygorii Strashko --- .../bindings/power/ti,keystone-powerdomain.txt | 31 ++++++ arch/arm/mach-keystone/Kconfig | 1 + arch/arm/mach-keystone/pm_domain.c | 112 ++++++++++++++------- 3 files changed, 107 insertions(+), 37 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/ti,keystone-powerdomain.txt diff --git a/Documentation/devicetree/bindings/power/ti,keystone-powerdomain.txt b/Documentation/devicetree/bindings/power/ti,keystone-powerdomain.txt new file mode 100644 index 0000000..4bbf2aa --- /dev/null +++ b/Documentation/devicetree/bindings/power/ti,keystone-powerdomain.txt @@ -0,0 +1,31 @@ +* TI Keystone 2 Generic PM Controller + +The TI Keystone 2 Generic PM Controller is responsible for Clock gating +for each controlled IP module. + +Required properties: +- compatible: Should be "ti,keystone-powerdomain" +- #power-domain-cells: Should be 0, see below: + +The gpc node is a power-controller as documented by the generic power domain +bindings in Documentation/devicetree/bindings/power/power_domain.txt. + +Example: + + pm_controller: pm-controller { + compatible = "ti,keystone-powerdomain"; + #power-domain-cells = <0>; + }; + + netcp: netcp@2090000 { + reg = <0x2620110 0x8>; + reg-names = "efuse"; + ... + #address-cells = <1>; + #size-cells = <1>; + ranges; + power-domains = <&pm_controller>; + + clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>; + dma-coherent; + } diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index 98a156a..de43107 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -9,6 +9,7 @@ config ARCH_KEYSTONE select COMMON_CLK_KEYSTONE select ARCH_SUPPORTS_BIG_ENDIAN select ZONE_DMA if ARM_LPAE + select PM_GENERIC_DOMAINS if PM help Support for boards based on the Texas Instruments Keystone family of SoCs. diff --git a/arch/arm/mach-keystone/pm_domain.c b/arch/arm/mach-keystone/pm_domain.c index ca79dda..d58759d 100644 --- a/arch/arm/mach-keystone/pm_domain.c +++ b/arch/arm/mach-keystone/pm_domain.c @@ -12,69 +12,107 @@ * version 2, as published by the Free Software Foundation. */ +#include #include -#include #include +#include #include -#include #include -#ifdef CONFIG_PM_RUNTIME -static int keystone_pm_runtime_suspend(struct device *dev) +#ifdef CONFIG_PM_GENERIC_DOMAINS + +struct keystone_domain { + struct generic_pm_domain genpd; + struct device *dev; +}; + +void keystone_pm_domain_attach_dev(struct device *dev) { + struct clk *clk; int ret; + int i = 0; dev_dbg(dev, "%s\n", __func__); - ret = pm_generic_runtime_suspend(dev); - if (ret) - return ret; - - ret = pm_clk_suspend(dev); + ret = pm_clk_create(dev); if (ret) { - pm_generic_runtime_resume(dev); - return ret; + dev_err(dev, "pm_clk_create failed %d\n", ret); + return; + }; + + while ((clk = of_clk_get(dev->of_node, i++)) && !IS_ERR(clk)) { + ret = pm_clk_add_clk(dev, clk); + if (ret) { + dev_err(dev, "pm_clk_add_clk failed %d\n", ret); + goto clk_err; + }; } - return 0; + if (!IS_ENABLED(CONFIG_PM_RUNTIME)) { + ret = pm_clk_resume(dev); + if (ret) { + dev_err(dev, "pm_clk_resume failed %d\n", ret); + goto clk_err; + }; + } + return; + +clk_err: + pm_clk_destroy(dev); } -static int keystone_pm_runtime_resume(struct device *dev) +void keystone_pm_domain_detach_dev(struct device *dev) { dev_dbg(dev, "%s\n", __func__); - - pm_clk_resume(dev); - - return pm_generic_runtime_resume(dev); + pm_clk_destroy(dev); } -#endif -static struct dev_pm_domain keystone_pm_domain = { - .ops = { - SET_RUNTIME_PM_OPS(keystone_pm_runtime_suspend, - keystone_pm_runtime_resume, NULL) - USE_PLATFORM_PM_SLEEP_OPS +static const struct keystone_domain keystone_domain = { + .genpd = { + .name = "keystone", + .attach_dev = keystone_pm_domain_attach_dev, + .detach_dev = keystone_pm_domain_detach_dev, + .dev_ops = { + .stop = pm_clk_suspend, + .start = pm_clk_resume, + }, }, }; -static struct pm_clk_notifier_block platform_domain_notifier = { - .pm_domain = &keystone_pm_domain, +static int keystone_pm_domain_probe(struct platform_device *pdev) +{ + struct keystone_domain *domain; + + domain = devm_kzalloc(&pdev->dev, + sizeof(struct keystone_domain), GFP_KERNEL); + if (!domain) + return -ENOMEM; + + domain->genpd = keystone_domain.genpd; + domain->dev = &pdev->dev; + + pm_genpd_init(&domain->genpd, NULL, false); + return of_genpd_add_provider_simple(pdev->dev.of_node, &domain->genpd); +} + +static struct of_device_id keystone_pm_domain_dt_ids[] = { + { .compatible = "ti,keystone-powerdomain" }, + { } }; -static struct of_device_id of_keystone_table[] = { - {.compatible = "ti,keystone"}, - { /* end of list */ }, +static struct platform_driver keystone_pm_domain_driver = { + .driver = { + .name = "ti,keystone-powerdomain", + .owner = THIS_MODULE, + .of_match_table = keystone_pm_domain_dt_ids, + }, + .probe = keystone_pm_domain_probe, }; int __init keystone_pm_runtime_init(void) { - struct device_node *np; - - np = of_find_matching_node(NULL, of_keystone_table); - if (!np) - return 0; - - pm_clk_add_notifier(&platform_bus_type, &platform_domain_notifier); - - return 0; + return platform_driver_register(&keystone_pm_domain_driver); } +#else +int __init keystone_pm_runtime_init(void) { return 0; } +#endif /* CONFIG_PM_GENERIC_DOMAINS */