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: 2676491 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CB7C63FD4F for ; Wed, 5 Jun 2013 23:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753912Ab3FEX5x (ORCPT ); Wed, 5 Jun 2013 19:57:53 -0400 Received: from mail-bk0-f50.google.com ([209.85.214.50]:47145 "EHLO mail-bk0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754208Ab3FEX5s (ORCPT ); Wed, 5 Jun 2013 19:57:48 -0400 Received: by mail-bk0-f50.google.com with SMTP id ik5so1252637bkc.9 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 Cc: linux-samsung-soc@vger.kernel.org, Kukjin Kim , Mark Brown , Mike Turquette , Arnd Bergmann , Olof Johansson , stern@rowland.harvard.edu, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, Tomasz Figa 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> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.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);