From patchwork Wed Jun 5 23:57:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2676521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 63CE33FD4F for ; Thu, 6 Jun 2013 00:03:44 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UkNg2-0005X0-P7; Thu, 06 Jun 2013 00:03:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UkNbA-0002Ml-Hw; Wed, 05 Jun 2013 23:58:36 +0000 Received: from mail-bk0-x229.google.com ([2a00:1450:4008:c01::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UkNaj-0002IB-4i for linux-arm-kernel@lists.infradead.org; Wed, 05 Jun 2013 23:58:10 +0000 Received: by mail-bk0-f41.google.com with SMTP id jc3so1243645bkc.0 for ; Wed, 05 Jun 2013 16:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=F2Ei3fwzYzhKBZ0bKafoMjMovMP82+1kNfrJjUaDBfg=; b=xAjQqp06ZUH6naWVngwTw9QPTryZFGTWzl+FPh8lzD2m0hNLT54MVWdOegLefgmna+ Axqknqyq6EEVLcJ1g2cH9fsaspqtVeCfq+ArtYeQjSOZ3gLxCgz6n9AzChdycQvQc8H3 lY+hx/ngQrJxpgYvjNnFgqgUjl5m1WSOMR1GwV+/uliyUA19lOeEfT+x4ov7XVB9tRAH HoImIfhy4yRJdwCJ8DVuIKEITher5Z1g0IihX0XSPOtFdHTMxe01yGDMl8oKzWp14zA0 d3rzgKJFoOoUuOsZ5fc1l08+Okl4qT57RMeZlLGcFQKFCe/LW3HX5cPp8fH/H2r8A+qu spuw== X-Received: by 10.204.78.76 with SMTP id j12mr10377130bkk.170.1370476667027; Wed, 05 Jun 2013 16:57:47 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id so13sm26761378bkb.15.2013.06.05.16.57.45 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 16:57:46 -0700 (PDT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/7] ARM: s3c64xx: dma: Use clk_prepare_enable/clk_disable_unprepare Date: Thu, 6 Jun 2013 01:57:28 +0200 Message-Id: <1370476651-6743-5-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1370476651-6743-1-git-send-email-tomasz.figa@gmail.com> References: <1370476651-6743-1-git-send-email-tomasz.figa@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130605_195809_388359_C7E107B7 X-CRM114-Status: GOOD ( 11.86 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomasz.figa[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Kukjin Kim , Mike Turquette , Arnd Bergmann , gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, Tomasz Figa , linux-samsung-soc@vger.kernel.org, Mark Brown , stern@rowland.harvard.edu, Olof Johansson 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 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 --- 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);