From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754806AbbG3AY2 (ORCPT ); Wed, 29 Jul 2015 20:24:28 -0400 Received: from down.free-electrons.com ([37.187.137.238]:56697 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754636AbbG3AWg (ORCPT ); Wed, 29 Jul 2015 20:22:36 -0400 From: Alexandre Belloni To: Nicolas Ferre Cc: Boris Brezillon , Maxime Ripard , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Belloni , Sebastian Reichel , Dmitry Eremin-Solenikov , linux-pm@vger.kernel.org Subject: [PATCH 17/20] power/reset: at91-reset: get and use slow clock Date: Thu, 30 Jul 2015 02:22:03 +0200 Message-Id: <1438215726-27452-18-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438215726-27452-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1438215726-27452-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit dca1a4b5ff6e ("clk: at91: keep slow clk enabled to prevent system hang") added a workaround for the slow clock as it is not properly handled by its users. Get and use the slow clock as it is necessary for the at91 reset controller. Signed-off-by: Alexandre Belloni --- Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: linux-pm@vger.kernel.org drivers/power/reset/at91-reset.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c index 3e8f478385c1..cd277570af6e 100644 --- a/drivers/power/reset/at91-reset.c +++ b/drivers/power/reset/at91-reset.c @@ -11,6 +11,7 @@ * warranty of any kind, whether express or implied. */ +#include #include #include #include @@ -46,6 +47,7 @@ enum reset_type { }; static void __iomem *at91_ramc_base[2], *at91_rstc_base; +static struct clk *sclk; /* * unless the SDRAM is cleanly shutdown before we hit the @@ -199,6 +201,15 @@ static int at91_reset_probe(struct platform_device *pdev) { int ret; + sclk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(sclk)) + return PTR_ERR(sclk); + + ret = clk_prepare_enable(sclk); + if (ret) { + dev_err(&pdev->dev, "Could not enable slow clock\n"); + return ret; + } ret = at91_reset_of_probe(pdev); if (ret) -- 2.1.4