From patchwork Mon Feb 17 10:04:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 3662741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4D2B9F2EC for ; Mon, 17 Feb 2014 11:21:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBDBD201E7 for ; Mon, 17 Feb 2014 11:21:40 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD0D0201DE for ; Mon, 17 Feb 2014 11:21:39 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFL6q-0002iR-4v; Mon, 17 Feb 2014 10:07:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFL6I-0008Fx-PK; Mon, 17 Feb 2014 10:06:58 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFL4v-00082a-78 for linux-arm-kernel@lists.infradead.org; Mon, 17 Feb 2014 10:05:47 +0000 Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WFL4T-0002Sz-LB; Mon, 17 Feb 2014 11:05:05 +0100 From: Philipp Zabel To: Shawn Guo Subject: [PATCH v3 3/7] ARM: imx6: gpc: Add pm clock support to PU power domain Date: Mon, 17 Feb 2014 11:04:59 +0100 Message-Id: <1392631503-17283-4-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392631503-17283-1-git-send-email-p.zabel@pengutronix.de> References: <1392631503-17283-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140217_050534_510755_205A671B X-CRM114-Status: GOOD ( 16.91 ) X-Spam-Score: -2.5 (--) Cc: Mark Rutland , devicetree@vger.kernel.org, kernel@pengutronix.de, Rob Herring , Philipp Zabel , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Drivers still handle clocks themselves, we only enable pm clocks of the GPU and VPU devices in the PU power domain temporarily during powerup so that the reset machinery can work. Signed-off-by: Philipp Zabel --- arch/arm/mach-imx/gpc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index c61126c..e16e36a 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -182,6 +183,7 @@ static int imx6q_pm_pu_power_off(struct generic_pm_domain *genpd) static int imx6q_pm_pu_power_on(struct generic_pm_domain *genpd) { + struct pm_domain_data *pdd; int ret; u32 val; int sw, sw2iso; @@ -192,6 +194,10 @@ static int imx6q_pm_pu_power_on(struct generic_pm_domain *genpd) return ret; } + /* Enable PM clocks for all devices in the PU domain */ + list_for_each_entry(pdd, &genpd->dev_list, list_node) + pm_clk_resume(pdd->dev); + /* Gate off PU domain when GPU/VPU when powered down */ writel_relaxed(0x1, gpc_base + GPC_PGC_GPU_PDN); @@ -208,6 +214,10 @@ static int imx6q_pm_pu_power_on(struct generic_pm_domain *genpd) /* Wait ISO + ISO2SW IPG clock cycles */ ndelay((sw + sw2iso) * 1000 / 66); + /* Disable PM clocks for all devices in the PU domain */ + list_for_each_entry(pdd, &genpd->dev_list, list_node) + pm_clk_suspend(pdd->dev); + return 0; } @@ -217,6 +227,68 @@ static struct generic_pm_domain imx6q_pu_domain = { .power_on = imx6q_pm_pu_power_on, }; +int imx6q_pm_clk_add(struct device *dev) +{ + struct device_node *np = dev->of_node; + const char *con_id; + struct clk *clk; + int i = 0; + + /* Add and prepare named clocks */ + while (!of_property_read_string_index(np, "clock-names", i, &con_id)) { + pm_clk_add(dev, con_id); + clk = of_clk_get(np, i); + if (!IS_ERR(clk)) { + clk_prepare(clk); + clk_put(clk); + } + i++; + } + + /* If no named clocks are given, add and prepare unnamed clock */ + if (i == 1 && of_find_property(dev->of_node, "clocks", NULL)) { + pm_clk_add(dev, NULL); + clk = of_clk_get(np, 0); + if (!IS_ERR(clk)) { + clk_prepare(clk); + clk_put(clk); + } + } + + return 0; +} + +int imx6q_pm_clk_remove(struct device *dev) +{ + struct device_node *np = dev->of_node; + const char *con_id; + struct clk *clk; + int i = 0; + + /* Remove and unprepare named clocks */ + while (!of_property_read_string_index(np, "clock-names", i, &con_id)) { + pm_clk_remove(dev, con_id); + clk = of_clk_get(np, i); + if (!IS_ERR(clk)) { + clk_unprepare(clk); + clk_put(clk); + } + i++; + } + + /* If no named clocks are given, remove and unprepare unnamed clock */ + if (i == 1 && of_find_property(dev->of_node, "clocks", NULL)) { + pm_clk_remove(dev, NULL); + clk = of_clk_get(np, 0); + if (!IS_ERR(clk)) { + clk_unprepare(clk); + clk_put(clk); + } + } + + return 0; +} + static int imx6q_pm_notifier_call(struct notifier_block *nb, unsigned long event, void *data) { @@ -235,6 +307,7 @@ static int imx6q_pm_notifier_call(struct notifier_block *nb, if (ret) dev_err(dev, "failed to add to power domain: %d\n", ret); + imx6q_pm_clk_add(dev); break; case BUS_NOTIFY_UNBOUND_DRIVER: genpd = dev_to_genpd(dev); @@ -245,6 +318,7 @@ static int imx6q_pm_notifier_call(struct notifier_block *nb, if (ret) dev_err(dev, "failed to remove from power domain: %d\n", ret); + imx6q_pm_clk_remove(dev); break; }