diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2010-12-21 18:03:06 -0800 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2010-12-21 22:51:17 -0800 |
| commit | 6429ac5afd7cf6ba69f7412ffe6193990e33955d (patch) | |
| tree | b76d79b94c1ed57d253a5bc4cc6d276bf8b0a7d6 | |
| parent | 6844e57c1b29111f189550b7746f7dc19da228b7 (diff) | |
tegra: common: move pll_m initialization to common.c
Change-Id: I87b032a92a4598c88f346b39731f2bb1b67b629f
Reviewed-on: http://git-master/r/14044
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index b04f4c9c8a51..97e2fe5ad237 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -152,7 +152,6 @@ static inline void ventana_bt_rfkill(void) { } static __initdata struct tegra_clk_init_table ventana_clk_init_table[] = { /* name parent rate enabled */ { "uartd", "pll_p", 216000000, true}, - { "pll_m", "clk_m", 600000000, true}, { "uartc", "pll_m", 600000000, false}, { "blink", "clk_32k", 32768, false}, { "pll_p_out4", "pll_p", 24000000, true }, diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index cca9d0611f1f..6e220cad52f1 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -78,7 +78,6 @@ static struct platform_device debug_uart = { static __initdata struct tegra_clk_init_table whistler_clk_init_table[] = { /* name parent rate enabled */ { "uarta", "pll_p", 216000000, true}, - { "pll_m", "clk_m", 600000000, true}, { "pwm", "clk_32k", 32768, false}, { "kbc", "clk_32k", 32768, true}, { NULL, NULL, 0, 0}, diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index a602d05d3461..969544dafcaf 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -65,6 +65,7 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = { /* set up clocks that should always be on */ /* name parent rate enabled */ { "clk_m", NULL, 0, true }, + { "pll_m", "clk_m", 600000000, true }, { "pll_p", "clk_m", 216000000, true }, { "pll_p_out1", "pll_p", 28800000, true }, { "pll_p_out2", "pll_p", 48000000, true }, |