aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
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 /drivers/clocksource
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 'drivers/clocksource')
-rw-r--r--drivers/clocksource/bcm2835_timer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index 7f796d8f7505..50c68fef944b 100644
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -16,7 +16,6 @@
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 */ 17 */
18 18
19#include <linux/bcm2835_timer.h>
20#include <linux/bitops.h> 19#include <linux/bitops.h>
21#include <linux/clockchips.h> 20#include <linux/clockchips.h>
22#include <linux/clocksource.h> 21#include <linux/clocksource.h>
@@ -101,7 +100,7 @@ static struct of_device_id bcm2835_time_match[] __initconst = {
101 {} 100 {}
102}; 101};
103 102
104void __init bcm2835_timer_init(void) 103static void __init bcm2835_timer_init(void)
105{ 104{
106 struct device_node *node; 105 struct device_node *node;
107 void __iomem *base; 106 void __iomem *base;
@@ -155,3 +154,5 @@ void __init bcm2835_timer_init(void)
155 154
156 pr_info("bcm2835: system timer (irq = %d)\n", irq); 155 pr_info("bcm2835: system timer (irq = %d)\n", irq);
157} 156}
157CLOCKSOURCE_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer",
158 bcm2835_timer_init);