Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 573145f0 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Daniel Lezcano
Browse files

clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE 



This is almost cosmetic: we achieve a bit of consistency with
other clocksource drivers by using the CLOCKSOURCE_OF_DECLARE
macro for the boilerplate code.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 3579698e

arch/arm/mach-mvebu/armada-370-xp.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/io.h>

#include <linux/time-armada-370-xp.h>

#include <linux/clocksource.h>

#include <linux/dma-mapping.h>

#include <linux/mbus.h>

#include <asm/hardware/cache-l2x0.h>
@@ -69,7 +69,7 @@ static void __init armada_370_xp_mbus_init(void) 
static void __init armada_370_xp_timer_and_clk_init(void)

{

	of_clk_init(NULL);

	armada_370_xp_timer_init();

	clocksource_of_init();

	coherency_init();

	armada_370_xp_mbus_init();

#ifdef CONFIG_CACHE_L2X0

drivers/clocksource/time-armada-370-xp.c

+3 −3
Original line number Diff line number Diff line
@@ -212,13 +212,11 @@ static struct local_timer_ops armada_370_xp_local_timer_ops = { 
	.stop	=  armada_370_xp_timer_stop,

};



void __init armada_370_xp_timer_init(void)

static void __init armada_370_xp_timer_init(struct device_node *np)

{

	u32 clr = 0, set = 0;

	struct device_node *np;

	int res;



	np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer");

	timer_base = of_iomap(np, 0);

	WARN_ON(!timer_base);

	local_base = of_iomap(np, 1);
@@ -290,3 +288,5 @@ void __init armada_370_xp_timer_init(void) 
#endif

	}

}

CLOCKSOURCE_OF_DECLARE(armada_370_xp, "marvell,armada-370-xp-timer",

		       armada_370_xp_timer_init);

include/linux/time-armada-370-xp.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/*

 * Marvell Armada 370/XP SoC timer handling.

 *

 * Copyright (C) 2012 Marvell

 *

 * Lior Amsalem <alior@marvell.com>

 * Gregory CLEMENT <gregory.clement@free-electrons.com>

 * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 *

 */

#ifndef __TIME_ARMADA_370_XPPRCMU_H

#define __TIME_ARMADA_370_XPPRCMU_H



#include <linux/init.h>



void __init armada_370_xp_timer_init(void);



#endif