aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-nomadik
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-05-06 06:14:17 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-06 15:17:20 -0400
commitaf7dc2281fd3cedc04cb51bcc0887cdaf65c3fcc (patch)
tree5bd51ed12452e283806827e1793415ba6011b757 /arch/arm/mach-nomadik
parentdc6048c7f97beaf8c5bb97ed772f43330d04727a (diff)
ARM: 6104/1: nomadik-gpio: use clk API
Add clocks with appropriate names in platforms that use it, and use the clk API in nomadik-gpio. Acked-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-nomadik')
-rw-r--r--arch/arm/mach-nomadik/clock.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/clock.c b/arch/arm/mach-nomadik/clock.c
index 7af785017782..60f5bee09f2e 100644
--- a/arch/arm/mach-nomadik/clock.c
+++ b/arch/arm/mach-nomadik/clock.c
@@ -37,6 +37,12 @@ static struct clk clk_48 = {
37 .rate = 48 * 1000 * 1000, 37 .rate = 48 * 1000 * 1000,
38}; 38};
39 39
40/*
41 * Catch-all default clock to satisfy drivers using the clk API. We don't
42 * model the actual hardware clocks yet.
43 */
44static struct clk clk_default;
45
40#define CLK(_clk, dev) \ 46#define CLK(_clk, dev) \
41 { \ 47 { \
42 .clk = _clk, \ 48 .clk = _clk, \
@@ -46,6 +52,10 @@ static struct clk clk_48 = {
46static struct clk_lookup lookups[] = { 52static struct clk_lookup lookups[] = {
47 CLK(&clk_48, "uart0"), 53 CLK(&clk_48, "uart0"),
48 CLK(&clk_48, "uart1"), 54 CLK(&clk_48, "uart1"),
55 CLK(&clk_default, "gpio.0"),
56 CLK(&clk_default, "gpio.1"),
57 CLK(&clk_default, "gpio.2"),
58 CLK(&clk_default, "gpio.3"),
49}; 59};
50 60
51static int __init clk_init(void) 61static int __init clk_init(void)