aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm2835/bcm2835.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2013-01-03 22:23:13 -0500
committerStephen Warren <swarren@wwwdotorg.org>2013-01-14 23:45:58 -0500
commitc1b724f6659a7e9e32f8fcf6409d053e1b7bccad (patch)
treef5ab383348e30169aad1fb54e2460e1b28560229 /arch/arm/mach-bcm2835/bcm2835.c
parentb2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (diff)
ARM: bcm2835: make use of CLKSRC_OF
Using CLKSRC_OF enables deletion of the SoC-specific header bcm2835_timer.h, replacing the custom function bcm2835_timer_init() with the standardized automatic clocksource_of_init(). Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch/arm/mach-bcm2835/bcm2835.c')
-rw-r--r--arch/arm/mach-bcm2835/bcm2835.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index 176d2d24782d..d615a61e902c 100644
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -17,8 +17,8 @@
17#include <linux/irqchip/bcm2835.h> 17#include <linux/irqchip/bcm2835.h>
18#include <linux/of_address.h> 18#include <linux/of_address.h>
19#include <linux/of_platform.h> 19#include <linux/of_platform.h>
20#include <linux/bcm2835_timer.h>
21#include <linux/clk/bcm2835.h> 20#include <linux/clk/bcm2835.h>
21#include <linux/clocksource.h>
22 22
23#include <asm/mach/arch.h> 23#include <asm/mach/arch.h>
24#include <asm/mach/map.h> 24#include <asm/mach/map.h>
@@ -104,7 +104,7 @@ DT_MACHINE_START(BCM2835, "BCM2835")
104 .init_irq = bcm2835_init_irq, 104 .init_irq = bcm2835_init_irq,
105 .handle_irq = bcm2835_handle_irq, 105 .handle_irq = bcm2835_handle_irq,
106 .init_machine = bcm2835_init, 106 .init_machine = bcm2835_init,
107 .init_time = bcm2835_timer_init, 107 .init_time = clocksource_of_init,
108 .restart = bcm2835_restart, 108 .restart = bcm2835_restart,
109 .dt_compat = bcm2835_compat 109 .dt_compat = bcm2835_compat
110MACHINE_END 110MACHINE_END