linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tomasz.figa@gmail.com (Tomasz Figa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/8] ARM: s3c64xx: dma: Use clk_prepare_enable/clk_disable_unprepare
Date: Tue, 23 Jul 2013 01:49:22 +0200	[thread overview]
Message-ID: <1374536965-3545-6-git-send-email-tomasz.figa@gmail.com> (raw)
In-Reply-To: <1374536965-3545-1-git-send-email-tomasz.figa@gmail.com>

This patch modifies s3c64xx DMA driver to prepare and unprepare clocks
in addition to enableind and disabling, since it is required by common
clock framework.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
 arch/arm/mach-s3c64xx/dma.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index 759846c..c511dfa 100644
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -677,7 +677,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
 		goto err_map;
 	}
 
-	clk_enable(dmac->clk);
+	clk_prepare_enable(dmac->clk);
 
 	dmac->regs = regs;
 	dmac->chanbase = chbase;
@@ -711,7 +711,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
 	return 0;
 
 err_clk:
-	clk_disable(dmac->clk);
+	clk_disable_unprepare(dmac->clk);
 	clk_put(dmac->clk);
 err_map:
 	iounmap(regs);
-- 
1.8.3.2

  parent reply	other threads:[~2013-07-22 23:49 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-22 23:49 [PATCH v2 0/8] Common Clock Framework support for Samsung S3C64xx Tomasz Figa
2013-07-22 23:49 ` [PATCH v2 1/8] clk: mux: Add support for read-only muxes Tomasz Figa
2013-07-23 11:22   ` Sergei Shtylyov
2013-07-23 11:25     ` Tomasz Figa
2013-07-27 12:41   ` Tomasz Figa
2013-08-02 21:46     ` Mike Turquette
2013-07-22 23:49 ` [PATCH v2 2/8] clk: samsung: pll: Add support for PLL6552 and PLL6553 Tomasz Figa
2013-07-23 23:52   ` [PATCH v3 " Tomasz Figa
2013-07-28 12:30     ` Mark Brown
2013-07-28 12:38       ` Tomasz Figa
2013-08-02 22:53         ` Mike Turquette
2013-07-22 23:49 ` [PATCH v2 3/8] clk: samsung: Add clock driver for S3C64xx SoCs Tomasz Figa
2013-07-23 23:55   ` [PATCH v3 " Tomasz Figa
2013-07-22 23:49 ` [PATCH v2 4/8] ARM: SAMSUNG: Add soc_is_s3c6400/s3c6410 macros Tomasz Figa
2013-07-22 23:49 ` Tomasz Figa [this message]
2013-07-28 12:32   ` [PATCH v2 5/8] ARM: s3c64xx: dma: Use clk_prepare_enable/clk_disable_unprepare Mark Brown
2013-07-22 23:49 ` [PATCH v2 6/8] usb: host: ohci-s3c2410 " Tomasz Figa
2013-07-23  0:15   ` Fabio Estevam
2013-07-23  0:44     ` Tomasz Figa
2013-07-31 18:58   ` Tomasz Figa
2013-07-31 20:44     ` Alan Stern
2013-08-01  7:45       ` Greg KH
2013-07-22 23:49 ` [PATCH v2 7/8] ARM: s3c64xx: Migrate clock handling to Common Clock Framework Tomasz Figa
2013-07-22 23:49 ` [PATCH v2 8/8] ARM: s3c64xx: Remove old clock management code Tomasz Figa
2013-07-24 12:20 ` [PATCH v2 0/8] Common Clock Framework support for Samsung S3C64xx Kukjin Kim
2013-08-05 17:01 ` Kukjin Kim
2013-08-05 18:06   ` Mike Turquette
2013-08-05 18:13     ` Kukjin Kim
2013-08-05 19:02       ` Mike Turquette
2013-08-05 23:42         ` Tomasz Figa
2013-08-06 19:47           ` Mike Turquette
2013-08-06 22:06             ` Tomasz Figa
2013-08-06 22:11               ` Kukjin Kim
2013-08-06 22:13                 ` Tomasz Figa
2013-08-16 10:44     ` Tomasz Figa
2013-08-16 21:02       ` Mike Turquette
2013-08-16 21:15         ` Tomasz Figa
2013-08-17 10:30           ` Kukjin Kim
2013-08-20  0:22             ` Mike Turquette
2013-08-20  7:09               ` Kukjin Kim
2013-08-25 17:19                 ` Kukjin Kim
2013-08-21  0:33               ` [PATCH] clk: samsung: pll: Use new registration method for PLL6552 and PLL6553 Tomasz Figa
2013-08-27  1:14                 ` Mike Turquette
2013-08-27 17:16                   ` Kukjin Kim
2013-08-27 23:45                     ` Mike Turquette

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=1374536965-3545-6-git-send-email-tomasz.figa@gmail.com \
    --to=tomasz.figa@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).