diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-06-26 03:18:32 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-06-26 15:04:58 -0400 |
commit | 72d967eda2fd69a6cac01498585bc019ade4f8ff (patch) | |
tree | 74b8d352a91967131d318796db4e6181688a5367 /arch/arm/mach-tegra | |
parent | 0b5168f92d587c328a4ac060a9f3d1a029ddc3b4 (diff) |
ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
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>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r-- | arch/arm/mach-tegra/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra2_clocks.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra30_clocks.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c index 2698d7d5c9ca..29c5114d607c 100644 --- a/arch/arm/mach-tegra/dma.c +++ b/arch/arm/mach-tegra/dma.c | |||
@@ -714,7 +714,7 @@ int __init tegra_dma_init(void) | |||
714 | 714 | ||
715 | bitmap_fill(channel_usage, NV_DMA_MAX_CHANNELS); | 715 | bitmap_fill(channel_usage, NV_DMA_MAX_CHANNELS); |
716 | 716 | ||
717 | c = clk_get_sys("tegra-dma", NULL); | 717 | c = clk_get_sys("tegra-apbdma", NULL); |
718 | if (IS_ERR(c)) { | 718 | if (IS_ERR(c)) { |
719 | pr_err("Unable to get clock for APB DMA\n"); | 719 | pr_err("Unable to get clock for APB DMA\n"); |
720 | ret = PTR_ERR(c); | 720 | ret = PTR_ERR(c); |
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 034d9529b51e..b79cb93ffd54 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c | |||
@@ -2149,7 +2149,7 @@ static struct clk tegra_clk_emc = { | |||
2149 | } | 2149 | } |
2150 | 2150 | ||
2151 | static struct clk tegra_list_clks[] = { | 2151 | static struct clk tegra_list_clks[] = { |
2152 | PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0), | 2152 | PERIPH_CLK("apbdma", "tegra-apbdma", NULL, 34, 0, 108000000, mux_pclk, 0), |
2153 | PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET), | 2153 | PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET), |
2154 | PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0), | 2154 | PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0), |
2155 | PERIPH_CLK("i2s1", "tegra20-i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71), | 2155 | PERIPH_CLK("i2s1", "tegra20-i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71), |
diff --git a/arch/arm/mach-tegra/tegra30_clocks.c b/arch/arm/mach-tegra/tegra30_clocks.c index e1a74895dc3a..2ba948ea21ff 100644 --- a/arch/arm/mach-tegra/tegra30_clocks.c +++ b/arch/arm/mach-tegra/tegra30_clocks.c | |||
@@ -2871,7 +2871,7 @@ static struct clk tegra30_clk_twd = { | |||
2871 | }, \ | 2871 | }, \ |
2872 | } | 2872 | } |
2873 | struct clk tegra_list_clks[] = { | 2873 | struct clk tegra_list_clks[] = { |
2874 | PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 26000000, mux_clk_m, 0), | 2874 | PERIPH_CLK("apbdma", "tegra-apbdma", NULL, 34, 0, 26000000, mux_clk_m, 0), |
2875 | PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET | PERIPH_ON_APB), | 2875 | PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET | PERIPH_ON_APB), |
2876 | PERIPH_CLK("kbc", "tegra-kbc", NULL, 36, 0, 32768, mux_clk_32k, PERIPH_NO_RESET | PERIPH_ON_APB), | 2876 | PERIPH_CLK("kbc", "tegra-kbc", NULL, 36, 0, 32768, mux_clk_32k, PERIPH_NO_RESET | PERIPH_ON_APB), |
2877 | PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0), | 2877 | PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0), |