From: FlorianSchandinat@gmx.de (Florian Tobias Schandinat)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/12] video: mxsfb: convert to clk_prepare/clk_unprepare
Date: Wed, 21 Dec 2011 02:11:36 +0000 [thread overview]
Message-ID: <4EF14058.9030205@gmx.de> (raw)
In-Reply-To: <1324382443-4439-10-git-send-email-shawn.guo@linaro.org>
On 12/20/2011 12:00 PM, Shawn Guo wrote:
> The patch converts mxsfb driver to clk_prepare/clk_unprepare by
> using helper functions clk_prepare_enable/clk_disable_unprepare.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> ---
> drivers/video/mxsfb.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
> index d837d63..eb3c5ee 100644
> --- a/drivers/video/mxsfb.c
> +++ b/drivers/video/mxsfb.c
> @@ -328,7 +328,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
>
> dev_dbg(&host->pdev->dev, "%s\n", __func__);
>
> - clk_enable(host->clk);
> + clk_prepare_enable(host->clk);
> clk_set_rate(host->clk, PICOS2KHZ(fb_info->var.pixclock) * 1000U);
>
> /* if it was disabled, re-enable the mode again */
> @@ -368,7 +368,7 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
>
> writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR);
>
> - clk_disable(host->clk);
> + clk_disable_unprepare(host->clk);
>
> host->enabled = 0;
> }
> @@ -668,7 +668,7 @@ static int __devinit mxsfb_restore_mode(struct mxsfb_info *host)
> line_count = fb_info->fix.smem_len / fb_info->fix.line_length;
> fb_info->fix.ypanstep = 1;
>
> - clk_enable(host->clk);
> + clk_prepare_enable(host->clk);
> host->enabled = 1;
>
> return 0;
> @@ -841,7 +841,7 @@ static int __devinit mxsfb_probe(struct platform_device *pdev)
>
> error_register:
> if (host->enabled)
> - clk_disable(host->clk);
> + clk_disable_unprepare(host->clk);
> fb_destroy_modelist(&fb_info->modelist);
> error_init_fb:
> kfree(fb_info->pseudo_palette);
next prev parent reply other threads:[~2011-12-21 2:11 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-20 12:00 [PATCH 0/12] Add clk_prepare/clk_unprepare for mxs clock api Shawn Guo
2011-12-20 12:00 ` [PATCH 01/12] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Shawn Guo
2011-12-20 13:48 ` Marek Vasut
2011-12-20 14:09 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 02/12] arm/mxs: convert platform code to clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:44 ` Marek Vasut
2011-12-20 21:11 ` Russell King - ARM Linux
2011-12-20 21:28 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 03/12] net: fec: add clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 04/12] dma: mxs-dma: convert to clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-23 17:35 ` Vinod Koul
2011-12-20 12:00 ` [PATCH 05/12] mmc: mxs-mmc: " Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 06/12] mtd: gpmi-lib: " Shawn Guo
2011-12-20 13:46 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 07/12] net: flexcan: " Shawn Guo
2011-12-20 13:48 ` Marek Vasut
2011-12-20 14:23 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 08/12] serial: mxs-auart: " Shawn Guo
2011-12-20 13:49 ` Marek Vasut
2011-12-20 14:07 ` Uwe Kleine-König
2011-12-20 21:15 ` Russell King - ARM Linux
2011-12-20 21:28 ` Marek Vasut
2011-12-20 22:24 ` Russell King - ARM Linux
2011-12-21 1:06 ` Marek Vasut
2011-12-20 14:27 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 09/12] video: mxsfb: " Shawn Guo
2011-12-20 13:49 ` Marek Vasut
2011-12-21 2:11 ` Florian Tobias Schandinat [this message]
2011-12-20 12:00 ` [PATCH 10/12] ASoC: mxs-saif: " Shawn Guo
2011-12-20 11:55 ` Mark Brown
2011-12-20 13:49 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 11/12] clk: add config option HAVE_CLK_PREPARE into Kconfig Shawn Guo
2011-12-20 12:00 ` [PATCH 12/12] arm/mxs: select HAVE_CLK_PREPARE for clock Shawn Guo
2011-12-20 13:43 ` [PATCH 0/12] Add clk_prepare/clk_unprepare for mxs clock api Marek Vasut
2011-12-20 14:05 ` Shawn Guo
2011-12-20 13:59 ` Marek Vasut
2011-12-20 14:21 ` Shawn Guo
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=4EF14058.9030205@gmx.de \
--to=florianschandinat@gmx.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.