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

Commit 5833ac98 authored by Barry Song's avatar Barry Song Committed by Daniel Lezcano
Browse files

clocksource: marco: Rename marco to atlas7 



marco project is replaced by atlas7 and we should obliterate
its all traces.

Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent d072c965

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ S: Maintained 
F:	arch/arm/mach-prima2/

F:	drivers/clk/sirf/

F:	drivers/clocksource/timer-prima2.c

F:	drivers/clocksource/timer-marco.c

F:	drivers/clocksource/timer-atlas7.c

N:	[^a-z]sirf



ARM/EBSA110 MACHINE SUPPORT

drivers/clocksource/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o 
obj-$(CONFIG_ORION_TIMER)	+= time-orion.o

obj-$(CONFIG_ARCH_BCM2835)	+= bcm2835_timer.o

obj-$(CONFIG_ARCH_CLPS711X)	+= clps711x-timer.o

obj-$(CONFIG_ARCH_MARCO)	+= timer-marco.o

obj-$(CONFIG_ARCH_ATLAS7)	+= timer-atlas7.o

obj-$(CONFIG_ARCH_MOXART)	+= moxart_timer.o

obj-$(CONFIG_ARCH_MXS)		+= mxs_timer.o

obj-$(CONFIG_ARCH_PXA)		+= pxa_timer.o

drivers/clocksource/timer-marco.c→drivers/clocksource/timer-atlas7.c

+7 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#define SIRFSOC_TIMER_REG_CNT 6



static unsigned long marco_timer_rate;

static unsigned long atlas7_timer_rate;



static const u32 sirfsoc_timer_reg_list[SIRFSOC_TIMER_REG_CNT] = {

	SIRFSOC_TIMER_WATCHDOG_EN,
@@ -195,7 +195,7 @@ static int sirfsoc_local_timer_setup(struct clock_event_device *ce) 
	ce->rating = 200;

	ce->set_mode = sirfsoc_timer_set_mode;

	ce->set_next_event = sirfsoc_timer_set_next_event;

	clockevents_calc_mult_shift(ce, marco_timer_rate, 60);

	clockevents_calc_mult_shift(ce, atlas7_timer_rate, 60);

	ce->max_delta_ns = clockevent_delta2ns(-2, ce);

	ce->min_delta_ns = clockevent_delta2ns(2, ce);

	ce->cpumask = cpumask_of(cpu);
@@ -255,7 +255,7 @@ static void __init sirfsoc_clockevent_init(void) 
}



/* initialize the kernel jiffy timer source */

static void __init sirfsoc_marco_timer_init(struct device_node *np)

static void __init sirfsoc_atlas7_timer_init(struct device_node *np)

{

	struct clk *clk;
@@ -264,7 +264,7 @@ static void __init sirfsoc_marco_timer_init(struct device_node *np) 


	BUG_ON(clk_prepare_enable(clk));



	marco_timer_rate = clk_get_rate(clk);

	atlas7_timer_rate = clk_get_rate(clk);



	/* timer dividers: 0, not divided */

	writel_relaxed(0, sirfsoc_timer_base + SIRFSOC_TIMER_64COUNTER_CTRL);
@@ -282,7 +282,7 @@ static void __init sirfsoc_marco_timer_init(struct device_node *np) 
	/* Clear all interrupts */

	writel_relaxed(0xFFFF, sirfsoc_timer_base + SIRFSOC_TIMER_INTR_STATUS);



	BUG_ON(clocksource_register_hz(&sirfsoc_clocksource, marco_timer_rate));

	BUG_ON(clocksource_register_hz(&sirfsoc_clocksource, atlas7_timer_rate));



	sirfsoc_clockevent_init();

}
@@ -301,6 +301,6 @@ static void __init sirfsoc_of_timer_init(struct device_node *np) 
	if (!sirfsoc_timer1_irq.irq)

		panic("No irq passed for timer1 via DT\n");



	sirfsoc_marco_timer_init(np);

	sirfsoc_atlas7_timer_init(np);

}

CLOCKSOURCE_OF_DECLARE(sirfsoc_marco_timer, "sirf,marco-tick", sirfsoc_of_timer_init );
 
CLOCKSOURCE_OF_DECLARE(sirfsoc_atlas7_timer, "sirf,atlas7-tick", sirfsoc_of_timer_init);