summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm2835/bcm2835.c
diff options
context:
space:
mode:
authorSimon Arlott <simon@fire.lp0.eu>2012-09-10 23:26:15 -0600
committerStephen Warren <swarren@wwwdotorg.org>2012-09-19 19:08:53 -0600
commit75fabc3f64489aa2c52eec54cd433ea269a25e05 (patch)
treeed157600173b8f860478c1f8dd12c93175c31d2f /arch/arm/mach-bcm2835/bcm2835.c
parentee4af5696720bb5b9de2e3b18be42089bed1e638 (diff)
ARM: bcm2835: add stub clock driver
This patch adds a minimal stub clock driver for the BCM2835. Its sole purpose is to allow the PL011 AMBA clk_get() API calls to provide something that looks enough like a clock that the driver probes and operates correctly. This patch was extracted from git://github.com/lp0/linux.git branch rpi-split as of 2012/09/08, and modified as follows: * Reworked to call clk_register_fixed_rate(), and clk_register_clkdev() rather than using static data to represent the clocks. * Moved implementation to drivers/clk/. * Modified .dev_id for UART clocks to match UART DT node names. * s/bcm2708/bcm2835/. * Modified device tree vendor prefix. Signed-off-by: Chris Boot <bootc@bootc.net> Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Dom Cobley <popcornmix@gmail.com> Signed-off-by: Dom Cobley <dc4@broadcom.com> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-bcm2835/bcm2835.c')
-rw-r--r--arch/arm/mach-bcm2835/bcm2835.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index e3f296860dd..f6fea493357 100644
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -16,6 +16,7 @@
#include <linux/irqchip/bcm2835.h>
#include <linux/of_platform.h>
#include <linux/bcm2835_timer.h>
+#include <linux/clk/bcm2835.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -38,6 +39,8 @@ void __init bcm2835_init(void)
{
int ret;
+ bcm2835_init_clocks();
+
ret = of_platform_populate(NULL, of_default_bus_match_table, NULL,
NULL);
if (ret) {