Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 20:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: tegra: clock: Rearrange static clock tables

Browse Source 
Make the static clocks look more like the array of clocks
so they can all be initalized with the same helper function.

Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Colin Cross <ccross@android.com>
This commit is contained in:
Colin Cross 2011-02-12 15:52:56 -08:00
parent 41cfe3676d
commit 3ec349fbf1
1 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
arch/arm/mach-tegra/tegra2_clocks.c
View File

@ -1775,7 +1775,7 @@ static struct clk_mux_sel mux_pclk[] = {
.max_rate = _max, \ .max_rate = _max, \
} }
struct clk tegra_periph_clks[] = { struct clk tegra_list_clks[] = {
PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0), PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0),
PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET), 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("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0),
@ -1885,71 +1885,67 @@ struct clk_duplicate tegra_clk_duplicates[] = {
.clk = ck, \ .clk = ck, \
} }
struct clk_lookup tegra_clk_lookups[] = { struct clk *tegra_ptr_clks[] = {
/* external root sources */ &tegra_clk_32k,
CLK(NULL, "32k_clk", &tegra_clk_32k), &tegra_pll_s,
CLK(NULL, "pll_s", &tegra_pll_s), &tegra_clk_m,
CLK(NULL, "clk_m", &tegra_clk_m), &tegra_pll_m,
CLK(NULL, "pll_m", &tegra_pll_m), &tegra_pll_m_out1,
CLK(NULL, "pll_m_out1", &tegra_pll_m_out1), &tegra_pll_c,
CLK(NULL, "pll_c", &tegra_pll_c), &tegra_pll_c_out1,
CLK(NULL, "pll_c_out1", &tegra_pll_c_out1), &tegra_pll_p,
CLK(NULL, "pll_p", &tegra_pll_p), &tegra_pll_p_out1,
CLK(NULL, "pll_p_out1", &tegra_pll_p_out1), &tegra_pll_p_out2,
CLK(NULL, "pll_p_out2", &tegra_pll_p_out2), &tegra_pll_p_out3,
CLK(NULL, "pll_p_out3", &tegra_pll_p_out3), &tegra_pll_p_out4,
CLK(NULL, "pll_p_out4", &tegra_pll_p_out4), &tegra_pll_a,
CLK(NULL, "pll_a", &tegra_pll_a), &tegra_pll_a_out0,
CLK(NULL, "pll_a_out0", &tegra_pll_a_out0), &tegra_pll_d,
CLK(NULL, "pll_d", &tegra_pll_d), &tegra_pll_d_out0,
CLK(NULL, "pll_d_out0", &tegra_pll_d_out0), &tegra_pll_u,
CLK(NULL, "pll_u", &tegra_pll_u), &tegra_pll_x,
CLK(NULL, "pll_x", &tegra_pll_x), &tegra_pll_e,
CLK(NULL, "pll_e", &tegra_pll_e), &tegra_clk_cclk,
CLK(NULL, "cclk", &tegra_clk_cclk), &tegra_clk_sclk,
CLK(NULL, "sclk", &tegra_clk_sclk), &tegra_clk_hclk,
CLK(NULL, "hclk", &tegra_clk_hclk), &tegra_clk_pclk,
CLK(NULL, "pclk", &tegra_clk_pclk), &tegra_clk_d,
CLK(NULL, "clk_d", &tegra_clk_d), &tegra_dev1_clk,
CLK(NULL, "clk_dev1", &tegra_dev1_clk), &tegra_dev2_clk,
CLK(NULL, "clk_dev2", &tegra_dev2_clk), &tegra_clk_virtual_cpu,
CLK(NULL, "cpu", &tegra_clk_virtual_cpu), &tegra_clk_blink,
CLK(NULL, "blink", &tegra_clk_blink),
}; };
static void tegra2_init_one_clock(struct clk *c)
{
clk_init(c);
if (!c->lookup.dev_id && !c->lookup.con_id)
c->lookup.con_id = c->name;
c->lookup.clk = c;
clkdev_add(&c->lookup);
}
void __init tegra2_init_clocks(void) void __init tegra2_init_clocks(void)
{ {
int i; int i;
struct clk_lookup *cl;
struct clk *c; struct clk *c;
struct clk_duplicate *cd;
for (i = 0; i < ARRAY_SIZE(tegra_clk_lookups); i++) { for (i = 0; i < ARRAY_SIZE(tegra_ptr_clks); i++)
cl = &tegra_clk_lookups[i]; tegra2_init_one_clock(tegra_ptr_clks[i]);
clk_init(cl->clk);
clkdev_add(cl);
}
for (i = 0; i < ARRAY_SIZE(tegra_periph_clks); i++) { for (i = 0; i < ARRAY_SIZE(tegra_list_clks); i++)
c = &tegra_periph_clks[i]; tegra2_init_one_clock(&tegra_list_clks[i]);
cl = &c->lookup;
cl->clk = c;
clk_init(cl->clk);
clkdev_add(cl);
}
for (i = 0; i < ARRAY_SIZE(tegra_clk_duplicates); i++) { for (i = 0; i < ARRAY_SIZE(tegra_clk_duplicates); i++) {
cd = &tegra_clk_duplicates[i]; c = tegra_get_clock_by_name(tegra_clk_duplicates[i].name);
c = tegra_get_clock_by_name(cd->name); if (!c) {
if (c) {
cl = &cd->lookup;
cl->clk = c;
clkdev_add(cl);
} else {
pr_err("%s: Unknown duplicate clock %s\n", __func__, pr_err("%s: Unknown duplicate clock %s\n", __func__,
cd->name); tegra_clk_duplicates[i].name);
continue;
} }
tegra_clk_duplicates[i].lookup.clk = c;
clkdev_add(&tegra_clk_duplicates[i].lookup);
} }
init_audio_sync_clock_mux(); init_audio_sync_clock_mux();