Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754951Ab3HKSAZ (ORCPT ); Sun, 11 Aug 2013 14:00:25 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:43151 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754788Ab3HKSAO (ORCPT ); Sun, 11 Aug 2013 14:00:14 -0400 From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Dan Williams , Jaroslav Kysela , Kukjin Kim , Liam Girdwood , Linus Walleij , Mark Brown , Mike Turquette , Padmavathi Venna , Russell King , Sangbeom Kim , Takashi Iwai , Vinod Koul , Tomasz Figa 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2121 Lines: 76 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) -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/