summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm/board_bcm.c
diff options
context:
space:
mode:
authorChristian Daudt <csd@broadcom.com>2013-03-13 14:27:27 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-03-28 10:58:55 -0700
commit8011657b9e63cb2e914b9a0f75233b910c1854cb (patch)
tree7eb4b207529dc5feaebf95e4335602cf64a4d887 /arch/arm/mach-bcm/board_bcm.c
parentdd5d70e869f960bde6376f4447fff59f16186cf5 (diff)
downloadtalos-obmc-linux-8011657b9e63cb2e914b9a0f75233b910c1854cb.tar.gz
talos-obmc-linux-8011657b9e63cb2e914b9a0f75233b910c1854cb.zip
ARM: bcm281xx: Add timer driver (driver portion)
This adds support for the Broadcom timer, used in the following SoCs: BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 Updates from V6: - Split DT portion into a separate patch Updates from V5: - Rebase to latest arm-soc/for-next Updates from V4: - Switch code to use CLOCKSOURCE_OF_DECLARE Updates from V3: - Migrate to 3.9 timer framework updates Updates from V2: - prepend static fns + fields with kona_ Updates from V1: - Rename bcm_timer.c to bcm_kona_timer.c - Pull .h into bcm_kona_timer.c - Make timers static - Clean up comment block - Switched to using clockevents_config_and_register - Added an error to the get_timer loop if it repeats too much - Added to Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt - Added missing readl to timer_disable_and_clear Note: bcm,kona-timer was kept as the 'compatible' field to make it specific enough for when there are multiple bcm timers (bcm,timer is too generic). Signed-off-by: Christian Daudt <csd@broadcom.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: John Stultz <john.stultz@linaro.org> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/arm/mach-bcm/board_bcm.c')
-rw-r--r--arch/arm/mach-bcm/board_bcm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index f0f9abafad29..259593540477 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -16,14 +16,11 @@
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/irqchip.h>
+#include <linux/clocksource.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-static void timer_init(void)
-{
-}
-
static void __init board_init(void)
{
@@ -35,7 +32,7 @@ static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
.init_irq = irqchip_init,
- .init_time = timer_init,
+ .init_time = clocksource_of_init,
.init_machine = board_init,
.dt_compat = bcm11351_dt_compat,
MACHINE_END
OpenPOWER on IntegriCloud