diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-01-11 16:52:34 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-06-10 20:41:40 +0400 |
| commit | 4a31bd28e86ac50eb620f6b5b36464c45b5fa38f (patch) | |
| tree | dffb284d13110554c77403b306979a50187c9905 /arch/arm/mach-nomadik/cpu-8815.c | |
| parent | b5111d9ed4cba9a29ee454db162c4a88c6b944bf (diff) | |
| download | linux-4a31bd28e86ac50eb620f6b5b36464c45b5fa38f.tar.xz | |
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 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/dma-mapping.h> +#include <linux/platform_data/clk-nomadik.h> #include <plat/gpio-nomadik.h> #include <mach/hardware.h> @@ -35,7 +36,6 @@ #include <asm/cacheflush.h> #include <asm/hardware/cache-l2x0.h> -#include "clock.h" #include "cpu-8815.h" /* The 8815 has 4 GPIO blocks, let's register them immediately */ @@ -123,7 +123,7 @@ void __init cpu8815_init_irq(void) * Init clocks here so that they are available for system timer * initialization. */ - clk_init(); + nomadik_clk_init(); } /* |