diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-06-13 10:01:28 +0100 |
|---|---|---|
| committer | Sireesh Tripurari <sireesh.tripurari@linaro.org> | 2013-12-10 10:38:45 +0000 |
| commit | b80d14303b65145317b0d49338c0bd766d4951d4 (patch) | |
| tree | 9de3beaa19d8ba7ab3ff838bf739528894c3d7a5 | |
| parent | 755e15f7cd72865b0777fc7e88a2ca744262fd9f (diff) | |
| download | juice-b80d14303b65145317b0d49338c0bd766d4951d4.tar.gz | |
ARM: vexpress: Add support for HDLCD
This is a temporary solution to get everything running.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index ffa9b73b7d3..b8e833e567f 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -1,10 +1,12 @@ /* * Versatile Express V2M Motherboard Support */ +#include <linux/clocksource.h> #include <linux/device.h> #include <linux/amba/bus.h> #include <linux/amba/mmci.h> #include <linux/io.h> +#include <linux/clocksource.h> #include <linux/smp.h> #include <linux/init.h> #include <linux/memblock.h> @@ -21,6 +23,7 @@ #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/vexpress.h> +#include <linux/clk-provider.h> #include <linux/clkdev.h> #include <asm/mach-types.h> @@ -446,11 +449,19 @@ void __init v2m_dt_init_early(void) "hardware (%x)!\n", dt_hbi, hbi); } - versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000); - v2m_dt_hdlcd_init(); } +static void __init v2m_dt_timer_init(void) +{ + of_clk_init(NULL); + + clocksource_of_init(); + + versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), + 24000000); +} + static const struct of_device_id v2m_dt_bus_match[] __initconst = { { .compatible = "simple-bus", }, { .compatible = "arm,amba-bus", }, @@ -475,5 +486,6 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express") .smp_init = smp_init_ops(vexpress_smp_init_ops), .map_io = v2m_dt_map_io, .init_early = v2m_dt_init_early, + .init_time = v2m_dt_timer_init, .init_machine = v2m_dt_init, MACHINE_END |