diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-01-11 07:52:34 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-06-10 12:41:40 -0400 |
commit | 4a31bd28e86ac50eb620f6b5b36464c45b5fa38f (patch) | |
tree | dffb284d13110554c77403b306979a50187c9905 /arch/arm/mach-nomadik/cpu-8815.c | |
parent | b5111d9ed4cba9a29ee454db162c4a88c6b944bf (diff) |
ARM: nomadik: convert to generic clock
Remove more custom stuff by simply converting the Nomadik machine
to use generic clocks and move the driver to drivers/clk.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mike Turquette <mturquette@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 88511fef7987..6fd8e46567a4 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
28 | #include <linux/platform_data/clk-nomadik.h> | ||
28 | 29 | ||
29 | #include <plat/gpio-nomadik.h> | 30 | #include <plat/gpio-nomadik.h> |
30 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
@@ -35,7 +36,6 @@ | |||
35 | #include <asm/cacheflush.h> | 36 | #include <asm/cacheflush.h> |
36 | #include <asm/hardware/cache-l2x0.h> | 37 | #include <asm/hardware/cache-l2x0.h> |
37 | 38 | ||
38 | #include "clock.h" | ||
39 | #include "cpu-8815.h" | 39 | #include "cpu-8815.h" |
40 | 40 | ||
41 | /* The 8815 has 4 GPIO blocks, let's register them immediately */ | 41 | /* The 8815 has 4 GPIO blocks, let's register them immediately */ |
@@ -123,7 +123,7 @@ void __init cpu8815_init_irq(void) | |||
123 | * Init clocks here so that they are available for system timer | 123 | * Init clocks here so that they are available for system timer |
124 | * initialization. | 124 | * initialization. |
125 | */ | 125 | */ |
126 | clk_init(); | 126 | nomadik_clk_init(); |
127 | } | 127 | } |
128 | 128 | ||
129 | /* | 129 | /* |