From: marek.vasut@gmail•com (Marek Vasut)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH V3 10/14] ARM: mxs: add clk_prepare/clk_unprepare
Date: Mon, 19 Dec 2011 23:21:41 +0100 [thread overview]
Message-ID: <201112192321.41560.marek.vasut@gmail.com> (raw)
In-Reply-To: <1321008637-19999-11-git-send-email-richard.zhao@linaro.org>
> Signed-off-by: Richard Zhao <richard.zhao@linaro•org>
> ---
> arch/arm/mach-mxs/system.c | 2 +-
> arch/arm/mach-mxs/timer.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
> index 20ec3bd..9760a12 100644
> --- a/arch/arm/mach-mxs/system.c
> +++ b/arch/arm/mach-mxs/system.c
> @@ -66,7 +66,7 @@ static int __init mxs_arch_reset_init(void)
>
> clk = clk_get_sys("rtc", NULL);
> if (!IS_ERR(clk))
> - clk_enable(clk);
> + clk_prepare_enable(clk);
>
> return 0;
> }
> diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
> index cace0d2..564a632 100644
> --- a/arch/arm/mach-mxs/timer.c
> +++ b/arch/arm/mach-mxs/timer.c
> @@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk
> *timer_clk)
>
> void __init mxs_timer_init(struct clk *timer_clk, int irq)
> {
> - clk_enable(timer_clk);
> + clk_prepare_enable(timer_clk);
>
> /*
> * Initialize timers to a known state
Hi Richard,
I just came across this, will this also help solve the mxs problem with mutex
lock begin done in atomic context in clk_enable/disable()?
M
next prev parent reply other threads:[~2011-12-19 22:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 10:50 [PATCH V3 00/14] add clk_prepare/clk_unprepare to imx drivers Richard Zhao
2011-11-11 10:50 ` [PATCH V3 01/14] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Richard Zhao
2011-11-11 10:50 ` [PATCH V3 02/14] ARM: mxc: time: add clk_prepare/clk_unprepare Richard Zhao
2011-11-11 10:50 ` [PATCH V3 03/14] ARM: mxc: ahci: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 04/14] ARM: mxc: pwm: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 05/14] ARM: mxc: epit: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 06/14] ARM: mxc: arch_reset: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 07/14] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 08/14] ARM: pm-imx5: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 10/14] ARM: mxs: " Richard Zhao
2011-12-19 22:21 ` Marek Vasut [this message]
2011-12-20 0:56 ` Richard Zhao
2011-12-20 2:15 ` Shawn Guo
2011-11-11 10:50 ` [PATCH V3 11/14] serial: imx: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 12/14] net: fec: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 13/14] i2c: imx: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 14/14] mmc: sdhci-esdhc-imx: " Richard Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112192321.41560.marek.vasut@gmail.com \
--to=marek.vasut@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox