From patchwork Sun Aug 11 17:59:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2842806 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 81996BF546 for ; Sun, 11 Aug 2013 18:54:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF3A62021E for ; Sun, 11 Aug 2013 18:54:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD6F2201EC for ; Sun, 11 Aug 2013 18:54:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8Zyx-00089P-8W; Sun, 11 Aug 2013 18:03:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8Zy4-0006qB-68; Sun, 11 Aug 2013 18:02:16 +0000 Received: from mail-bk0-x236.google.com ([2a00:1450:4008:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8ZwQ-0006bd-9G for linux-arm-kernel@lists.infradead.org; Sun, 11 Aug 2013 18:00:36 +0000 Received: by mail-bk0-f54.google.com with SMTP id mz12so1595395bkb.13 for ; Sun, 11 Aug 2013 11:00:12 -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:in-reply-to:references; bh=gHmUm3pQbqaTYYYJzcjS9l3CITOb+3UziTtFImFKfUg=; b=xg/LsYh1gLKLjqM5IOcc6P9MAopVDjdQnlzlZLro/h7HEtbJtkCLES6zVDVHO3nFsS z3oKHq2VGIG+vY+SnkrVyT6exkLPLWRPsf9qLN9bk9eetNL1pg4hJqfgF4KKkgjj9Zun GX6ZmlFSW6oJAv2TTotpXnjreit8pM0cTv0BrOaUziHCpDL3CPD2ddvpHwWUa79yWZbK LGv15+BJ/QnWyixhZFLxEbOWT8rLyIFnR50fEzP9m61a/Sj99aasd9+OBMy/gSMQd+Y5 ezPWk/uQbC7UjV1+//0AEA3ZEOi+vWO5Jhc6G+ksisoSkQ1V+tyb9YjeuLlPKlFpoZ9s fhyQ== X-Received: by 10.204.53.200 with SMTP id n8mr3098422bkg.97.1376244012867; Sun, 11 Aug 2013 11:00:12 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id nv4sm4838824bkb.3.2013.08.11.11.00.10 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 11 Aug 2013 11:00:12 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 13/18] ARM: s3c64xx: clock: Add clkdev lookup for DMA clocks Date: Sun, 11 Aug 2013 19:59:25 +0200 Message-Id: <1376243970-6489-14-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1376243970-6489-1-git-send-email-tomasz.figa@gmail.com> References: <1376243970-6489-1-git-send-email-tomasz.figa@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130811_140034_527157_CDFF9DCF X-CRM114-Status: GOOD ( 11.57 ) X-Spam-Score: -2.0 (--) Cc: alsa-devel@alsa-project.org, Kukjin Kim , Mike Turquette , Liam Girdwood , Sangbeom Kim , Vinod Koul , Linus Walleij , Padmavathi Venna , linux-kernel@vger.kernel.org, Jaroslav Kysela , Takashi Iwai , Mark Brown , Dan Williams , Russell King , linux-spi@vger.kernel.org, Tomasz Figa , linux-arm-kernel@lists.infradead.org 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 X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds clkdev lookup entries for clocks used by PL08x DMA driver. Signed-off-by: Tomasz Figa --- arch/arm/mach-s3c64xx/clock.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 8499415..33aa851 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -194,16 +194,6 @@ static struct clk init_clocks_off[] = { .enable = s3c64xx_hclk_ctrl, .ctrlbit = S3C_CLKCON_HCLK_IHOST, }, { - .name = "dma0", - .parent = &clk_h, - .enable = s3c64xx_hclk_ctrl, - .ctrlbit = S3C_CLKCON_HCLK_DMA0, - }, { - .name = "dma1", - .parent = &clk_h, - .enable = s3c64xx_hclk_ctrl, - .ctrlbit = S3C_CLKCON_HCLK_DMA1, - }, { .name = "3dse", .parent = &clk_h, .enable = s3c64xx_hclk_ctrl, @@ -345,6 +335,20 @@ static struct clk clk_i2s2 = { }; #endif +static struct clk clk_dma0 = { + .name = "dma0", + .parent = &clk_h, + .enable = s3c64xx_hclk_ctrl, + .ctrlbit = S3C_CLKCON_HCLK_DMA0, +}; + +static struct clk clk_dma1 = { + .name = "dma1", + .parent = &clk_h, + .enable = s3c64xx_hclk_ctrl, + .ctrlbit = S3C_CLKCON_HCLK_DMA1, +}; + static struct clk init_clocks[] = { { .name = "lcd", @@ -849,6 +853,8 @@ static struct clk *clk_cdev[] = { &clk_48m_spi1, &clk_i2s0, &clk_i2s1, + &clk_dma0, + &clk_dma1, }; static struct clk_lookup s3c64xx_clk_lookup[] = { @@ -873,6 +879,8 @@ static struct clk_lookup s3c64xx_clk_lookup[] = { CLKDEV_INIT("samsung-i2s.2", "i2s_opclk0", &clk_i2s2), CLKDEV_INIT("samsung-i2s.2", "i2s_opclk1", &clk_audio_bus2.clk), #endif + CLKDEV_INIT("dma-pl080s.0", "apb_pclk", &clk_dma0), + CLKDEV_INIT("dma-pl080s.1", "apb_pclk", &clk_dma1), }; #define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1)