]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
authorLaxman Dewangan <ldewangan@nvidia.com>
Tue, 26 Jun 2012 07:18:32 +0000 (12:48 +0530)
committerStephen Warren <swarren@nvidia.com>
Tue, 26 Jun 2012 19:04:58 +0000 (13:04 -0600)
Rename the driver name of the clock entry of Tegra APBDMA to
tegra-apbdma from of tegra-dma.

This name is more aligned towards the movement of dmaengine based
new DMA driver.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
arch/arm/mach-tegra/dma.c
arch/arm/mach-tegra/tegra2_clocks.c
arch/arm/mach-tegra/tegra30_clocks.c

index 2698d7d5c9cab17235bc9aba0149503e1799ffda..29c5114d607ccc1b651be43381d3e15bf3db7257 100644 (file)
@@ -714,7 +714,7 @@ int __init tegra_dma_init(void)
 
        bitmap_fill(channel_usage, NV_DMA_MAX_CHANNELS);
 
-       c = clk_get_sys("tegra-dma", NULL);
+       c = clk_get_sys("tegra-apbdma", NULL);
        if (IS_ERR(c)) {
                pr_err("Unable to get clock for APB DMA\n");
                ret = PTR_ERR(c);
index 034d9529b51ee0df13104c5962d620679bde8d3e..b79cb93ffd548425aa362e470a40612c3a60da7f 100644 (file)
@@ -2149,7 +2149,7 @@ static struct clk tegra_clk_emc = {
        }
 
 static struct clk tegra_list_clks[] = {
-       PERIPH_CLK("apbdma",    "tegra-dma",            NULL,   34,     0,      108000000, mux_pclk,                    0),
+       PERIPH_CLK("apbdma",    "tegra-apbdma",         NULL,   34,     0,      108000000, mux_pclk,                    0),
        PERIPH_CLK("rtc",       "rtc-tegra",            NULL,   4,      0,      32768,     mux_clk_32k,                 PERIPH_NO_RESET),
        PERIPH_CLK("timer",     "timer",                NULL,   5,      0,      26000000,  mux_clk_m,                   0),
        PERIPH_CLK("i2s1",      "tegra20-i2s.0",        NULL,   11,     0x100,  26000000,  mux_pllaout0_audio2x_pllp_clkm,      MUX | DIV_U71),
index e1a74895dc3a42ea781ae71b454715f5ebbb8eb5..2ba948ea21ff11671c8ca882c016e3ebfa0fb386 100644 (file)
@@ -2871,7 +2871,7 @@ static struct clk tegra30_clk_twd = {
                },                                      \
        }
 struct clk tegra_list_clks[] = {
-       PERIPH_CLK("apbdma",    "tegra-dma",            NULL,   34,     0,      26000000,  mux_clk_m,                   0),
+       PERIPH_CLK("apbdma",    "tegra-apbdma",         NULL,   34,     0,      26000000,  mux_clk_m,                   0),
        PERIPH_CLK("rtc",       "rtc-tegra",            NULL,   4,      0,      32768,     mux_clk_32k,                 PERIPH_NO_RESET | PERIPH_ON_APB),
        PERIPH_CLK("kbc",       "tegra-kbc",            NULL,   36,     0,      32768,     mux_clk_32k,                 PERIPH_NO_RESET | PERIPH_ON_APB),
        PERIPH_CLK("timer",     "timer",                NULL,   5,      0,      26000000,  mux_clk_m,                   0),