mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

clk: mvebu: introduce per-clock-gate flags

Browse source 
Clock gates found on MVEBU SoCs get registered by a common function.
To allow specific SoCs to provide tweaks introduce flags to the clock
gate descriptor instead of filling up the common function SoC specific
tweaks.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2013-05-11 03:08:01 +02:00 committed by Jason Cooper
parent 3d9939c92e
commit 29020c9a40
1 changed files with 78 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
drivers/clk/mvebu/clk-gating-ctrl.c
View file

@ -28,6 +28,7 @@ struct mvebu_soc_descr {
const char *name; const char *name;
const char *parent; const char *parent;
int bit_idx; int bit_idx;
unsigned long flags;
}; };
#define to_clk_gate(_hw) container_of(_hw, struct clk_gate, hw) #define to_clk_gate(_hw) container_of(_hw, struct clk_gate, hw)
@ -88,21 +89,11 @@ static void __init mvebu_clk_gating_setup(
} }
for (n = 0; n < ctrl->num_gates; n++) { for (n = 0; n < ctrl->num_gates; n++) {
u8 flags = 0;
const char *parent = const char *parent =
(descr[n].parent) ? descr[n].parent : default_parent; (descr[n].parent) ? descr[n].parent : default_parent;
/*
* On Armada 370, the DDR clock is a special case: it
* isn't taken by any driver, but should anyway be
* kept enabled, so we mark it as IGNORE_UNUSED for
* now.
*/
if (!strcmp(descr[n].name, "ddr"))
flags |= CLK_IGNORE_UNUSED;
ctrl->gates[n] = clk_register_gate(NULL, descr[n].name, parent, ctrl->gates[n] = clk_register_gate(NULL, descr[n].name, parent,
flags, base, descr[n].bit_idx, 0, &ctrl->lock); descr[n].flags, base, descr[n].bit_idx,
0, &ctrl->lock);
WARN_ON(IS_ERR(ctrl->gates[n])); WARN_ON(IS_ERR(ctrl->gates[n]));
} }
of_clk_add_provider(np, mvebu_clk_gating_get_src, ctrl); of_clk_add_provider(np, mvebu_clk_gating_get_src, ctrl);
@ -114,99 +105,99 @@ static void __init mvebu_clk_gating_setup(
#ifdef CONFIG_MACH_ARMADA_370 #ifdef CONFIG_MACH_ARMADA_370
static const struct mvebu_soc_descr __initconst armada_370_gating_descr[] = { static const struct mvebu_soc_descr __initconst armada_370_gating_descr[] = {
{ "audio", NULL, 0 }, { "audio", NULL, 0, 0 },
{ "pex0_en", NULL, 1 }, { "pex0_en", NULL, 1, 0 },
{ "pex1_en", NULL, 2 }, { "pex1_en", NULL, 2, 0 },
{ "ge1", NULL, 3 }, { "ge1", NULL, 3, 0 },
{ "ge0", NULL, 4 }, { "ge0", NULL, 4, 0 },
{ "pex0", "pex0_en", 5 }, { "pex0", "pex0_en", 5, 0 },
{ "pex1", "pex1_en", 9 }, { "pex1", "pex1_en", 9, 0 },
{ "sata0", NULL, 15 }, { "sata0", NULL, 15, 0 },
{ "sdio", NULL, 17 }, { "sdio", NULL, 17, 0 },
{ "tdm", NULL, 25 }, { "tdm", NULL, 25, 0 },
{ "ddr", NULL, 28 }, { "ddr", NULL, 28, CLK_IGNORE_UNUSED },
{ "sata1", NULL, 30 }, { "sata1", NULL, 30, 0 },
{ } { }
}; };
#endif #endif
#ifdef CONFIG_MACH_ARMADA_XP #ifdef CONFIG_MACH_ARMADA_XP
static const struct mvebu_soc_descr __initconst armada_xp_gating_descr[] = { static const struct mvebu_soc_descr __initconst armada_xp_gating_descr[] = {
{ "audio", NULL, 0 }, { "audio", NULL, 0, 0 },
{ "ge3", NULL, 1 }, { "ge3", NULL, 1, 0 },
{ "ge2", NULL, 2 }, { "ge2", NULL, 2, 0 },
{ "ge1", NULL, 3 }, { "ge1", NULL, 3, 0 },
{ "ge0", NULL, 4 }, { "ge0", NULL, 4, 0 },
{ "pex00", NULL, 5 }, { "pex00", NULL, 5, 0 },
{ "pex01", NULL, 6 }, { "pex01", NULL, 6, 0 },
{ "pex02", NULL, 7 }, { "pex02", NULL, 7, 0 },
{ "pex03", NULL, 8 }, { "pex03", NULL, 8, 0 },
{ "pex10", NULL, 9 }, { "pex10", NULL, 9, 0 },
{ "pex11", NULL, 10 }, { "pex11", NULL, 10, 0 },
{ "pex12", NULL, 11 }, { "pex12", NULL, 11, 0 },
{ "pex13", NULL, 12 }, { "pex13", NULL, 12, 0 },
{ "bp", NULL, 13 }, { "bp", NULL, 13, 0 },
{ "sata0lnk", NULL, 14 }, { "sata0lnk", NULL, 14, 0 },
{ "sata0", "sata0lnk", 15 }, { "sata0", "sata0lnk", 15, 0 },
{ "lcd", NULL, 16 }, { "lcd", NULL, 16, 0 },
{ "sdio", NULL, 17 }, { "sdio", NULL, 17, 0 },
{ "usb0", NULL, 18 }, { "usb0", NULL, 18, 0 },
{ "usb1", NULL, 19 }, { "usb1", NULL, 19, 0 },
{ "usb2", NULL, 20 }, { "usb2", NULL, 20, 0 },
{ "xor0", NULL, 22 }, { "xor0", NULL, 22, 0 },
{ "crypto", NULL, 23 }, { "crypto", NULL, 23, 0 },
{ "tdm", NULL, 25 }, { "tdm", NULL, 25, 0 },
{ "pex20", NULL, 26 }, { "pex20", NULL, 26, 0 },
{ "pex30", NULL, 27 }, { "pex30", NULL, 27, 0 },
{ "xor1", NULL, 28 }, { "xor1", NULL, 28, 0 },
{ "sata1lnk", NULL, 29 }, { "sata1lnk", NULL, 29, 0 },
{ "sata1", "sata1lnk", 30 }, { "sata1", "sata1lnk", 30, 0 },
{ } { }
}; };
#endif #endif
#ifdef CONFIG_ARCH_DOVE #ifdef CONFIG_ARCH_DOVE
static const struct mvebu_soc_descr __initconst dove_gating_descr[] = { static const struct mvebu_soc_descr __initconst dove_gating_descr[] = {
{ "usb0", NULL, 0 }, { "usb0", NULL, 0, 0 },
{ "usb1", NULL, 1 }, { "usb1", NULL, 1, 0 },
{ "ge", "gephy", 2 }, { "ge", "gephy", 2, 0 },
{ "sata", NULL, 3 }, { "sata", NULL, 3, 0 },
{ "pex0", NULL, 4 }, { "pex0", NULL, 4, 0 },
{ "pex1", NULL, 5 }, { "pex1", NULL, 5, 0 },
{ "sdio0", NULL, 8 }, { "sdio0", NULL, 8, 0 },
{ "sdio1", NULL, 9 }, { "sdio1", NULL, 9, 0 },
{ "nand", NULL, 10 }, { "nand", NULL, 10, 0 },
{ "camera", NULL, 11 }, { "camera", NULL, 11, 0 },
{ "i2s0", NULL, 12 }, { "i2s0", NULL, 12, 0 },
{ "i2s1", NULL, 13 }, { "i2s1", NULL, 13, 0 },
{ "crypto", NULL, 15 }, { "crypto", NULL, 15, 0 },
{ "ac97", NULL, 21 }, { "ac97", NULL, 21, 0 },
{ "pdma", NULL, 22 }, { "pdma", NULL, 22, 0 },
{ "xor0", NULL, 23 }, { "xor0", NULL, 23, 0 },
{ "xor1", NULL, 24 }, { "xor1", NULL, 24, 0 },
{ "gephy", NULL, 30 }, { "gephy", NULL, 30, 0 },
{ } { }
}; };
#endif #endif
#ifdef CONFIG_ARCH_KIRKWOOD #ifdef CONFIG_ARCH_KIRKWOOD
static const struct mvebu_soc_descr __initconst kirkwood_gating_descr[] = { static const struct mvebu_soc_descr __initconst kirkwood_gating_descr[] = {
{ "ge0", NULL, 0 }, { "ge0", NULL, 0, 0 },
{ "pex0", NULL, 2 }, { "pex0", NULL, 2, 0 },
{ "usb0", NULL, 3 }, { "usb0", NULL, 3, 0 },
{ "sdio", NULL, 4 }, { "sdio", NULL, 4, 0 },
{ "tsu", NULL, 5 }, { "tsu", NULL, 5, 0 },
{ "runit", NULL, 7 }, { "runit", NULL, 7, 0 },
{ "xor0", NULL, 8 }, { "xor0", NULL, 8, 0 },
{ "audio", NULL, 9 }, { "audio", NULL, 9, 0 },
{ "powersave", "cpuclk", 11 }, { "powersave", "cpuclk", 11, 0 },
{ "sata0", NULL, 14 }, { "sata0", NULL, 14, 0 },
{ "sata1", NULL, 15 }, { "sata1", NULL, 15, 0 },
{ "xor1", NULL, 16 }, { "xor1", NULL, 16, 0 },
{ "crypto", NULL, 17 }, { "crypto", NULL, 17, 0 },
{ "pex1", NULL, 18 }, { "pex1", NULL, 18, 0 },
{ "ge1", NULL, 19 }, { "ge1", NULL, 19, 0 },
{ "tdm", NULL, 20 }, { "tdm", NULL, 20, 0 },
{ } { }
}; };
#endif #endif