diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-03 20:23:13 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:45:58 -0700 |
| commit | c1b724f6659a7e9e32f8fcf6409d053e1b7bccad (patch) | |
| tree | f5ab383348e30169aad1fb54e2460e1b28560229 /arch/arm/mach-bcm2835 | |
| parent | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (diff) | |
| download | linux-stable-c1b724f6659a7e9e32f8fcf6409d053e1b7bccad.tar.gz linux-stable-c1b724f6659a7e9e32f8fcf6409d053e1b7bccad.tar.bz2 linux-stable-c1b724f6659a7e9e32f8fcf6409d053e1b7bccad.zip | |
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')
| -rw-r--r-- | arch/arm/mach-bcm2835/bcm2835.c | 4 |
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 @@ #include <linux/irqchip/bcm2835.h> #include <linux/of_address.h> #include <linux/of_platform.h> -#include <linux/bcm2835_timer.h> #include <linux/clk/bcm2835.h> +#include <linux/clocksource.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -104,7 +104,7 @@ DT_MACHINE_START(BCM2835, "BCM2835") .init_irq = bcm2835_init_irq, .handle_irq = bcm2835_handle_irq, .init_machine = bcm2835_init, - .init_time = bcm2835_timer_init, + .init_time = clocksource_of_init, .restart = bcm2835_restart, .dt_compat = bcm2835_compat MACHINE_END |