Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clocksource: marco: Rename marco to atlas7

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

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

authored by

Barry Song and committed by
Daniel Lezcano
5833ac98 d072c965

+9 -9
+1 -1
MAINTAINERS
··· 958 958 F: arch/arm/mach-prima2/ 959 959 F: drivers/clk/sirf/ 960 960 F: drivers/clocksource/timer-prima2.c 961 - F: drivers/clocksource/timer-marco.c 961 + F: drivers/clocksource/timer-atlas7.c 962 962 N: [^a-z]sirf 963 963 964 964 ARM/EBSA110 MACHINE SUPPORT
+1 -1
drivers/clocksource/Makefile
··· 18 18 obj-$(CONFIG_ORION_TIMER) += time-orion.o 19 19 obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o 20 20 obj-$(CONFIG_ARCH_CLPS711X) += clps711x-timer.o 21 - obj-$(CONFIG_ARCH_MARCO) += timer-marco.o 21 + obj-$(CONFIG_ARCH_ATLAS7) += timer-atlas7.o 22 22 obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o 23 23 obj-$(CONFIG_ARCH_MXS) += mxs_timer.o 24 24 obj-$(CONFIG_ARCH_PXA) += pxa_timer.o
+7 -7
drivers/clocksource/timer-marco.c drivers/clocksource/timer-atlas7.c
··· 38 38 39 39 #define SIRFSOC_TIMER_REG_CNT 6 40 40 41 - static unsigned long marco_timer_rate; 41 + static unsigned long atlas7_timer_rate; 42 42 43 43 static const u32 sirfsoc_timer_reg_list[SIRFSOC_TIMER_REG_CNT] = { 44 44 SIRFSOC_TIMER_WATCHDOG_EN, ··· 195 195 ce->rating = 200; 196 196 ce->set_mode = sirfsoc_timer_set_mode; 197 197 ce->set_next_event = sirfsoc_timer_set_next_event; 198 - clockevents_calc_mult_shift(ce, marco_timer_rate, 60); 198 + clockevents_calc_mult_shift(ce, atlas7_timer_rate, 60); 199 199 ce->max_delta_ns = clockevent_delta2ns(-2, ce); 200 200 ce->min_delta_ns = clockevent_delta2ns(2, ce); 201 201 ce->cpumask = cpumask_of(cpu); ··· 255 255 } 256 256 257 257 /* initialize the kernel jiffy timer source */ 258 - static void __init sirfsoc_marco_timer_init(struct device_node *np) 258 + static void __init sirfsoc_atlas7_timer_init(struct device_node *np) 259 259 { 260 260 struct clk *clk; 261 261 ··· 264 264 265 265 BUG_ON(clk_prepare_enable(clk)); 266 266 267 - marco_timer_rate = clk_get_rate(clk); 267 + atlas7_timer_rate = clk_get_rate(clk); 268 268 269 269 /* timer dividers: 0, not divided */ 270 270 writel_relaxed(0, sirfsoc_timer_base + SIRFSOC_TIMER_64COUNTER_CTRL); ··· 282 282 /* Clear all interrupts */ 283 283 writel_relaxed(0xFFFF, sirfsoc_timer_base + SIRFSOC_TIMER_INTR_STATUS); 284 284 285 - BUG_ON(clocksource_register_hz(&sirfsoc_clocksource, marco_timer_rate)); 285 + BUG_ON(clocksource_register_hz(&sirfsoc_clocksource, atlas7_timer_rate)); 286 286 287 287 sirfsoc_clockevent_init(); 288 288 } ··· 301 301 if (!sirfsoc_timer1_irq.irq) 302 302 panic("No irq passed for timer1 via DT\n"); 303 303 304 - sirfsoc_marco_timer_init(np); 304 + sirfsoc_atlas7_timer_init(np); 305 305 } 306 - CLOCKSOURCE_OF_DECLARE(sirfsoc_marco_timer, "sirf,marco-tick", sirfsoc_of_timer_init ); 306 + CLOCKSOURCE_OF_DECLARE(sirfsoc_atlas7_timer, "sirf,atlas7-tick", sirfsoc_of_timer_init);