From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 9/9] clocksource: marco: rename marco to atlas7
Date: Sun, 04 Jan 2015 19:00:40 +0100 [thread overview]
Message-ID: <54A97FC8.7000505@linaro.org> (raw)
In-Reply-To: <1420249007-8262-10-git-send-email-21cnbao@gmail.com>
On 01/03/2015 02:36 AM, Barry Song wrote:
> From: Barry Song <Baohua.Song@csr.com>
>
> marco project is replaced by atlas7 and we should obliterate
> its all traces.
>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
> drivers/clocksource/Makefile | 2 +-
> drivers/clocksource/{timer-marco.c => timer-atlas7.c} | 15 +++++++--------
> 2 files changed, 8 insertions(+), 9 deletions(-)
> rename drivers/clocksource/{timer-marco.c => timer-atlas7.c} (95%)
>
> diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
> index 94d90b2..306bc47 100644
> --- a/drivers/clocksource/Makefile
> +++ b/drivers/clocksource/Makefile
> @@ -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
> diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-atlas7.c
> similarity index 95%
> rename from drivers/clocksource/timer-marco.c
> rename to drivers/clocksource/timer-atlas7.c
> index 361a789..60f9de3 100644
> --- a/drivers/clocksource/timer-marco.c
> +++ b/drivers/clocksource/timer-atlas7.c
> @@ -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,9 +255,8 @@ 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)
> {
> - u32 timer_div;
> struct clk *clk;
>
> clk = of_clk_get(np, 0);
> @@ -265,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);
> @@ -283,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();
> }
> @@ -302,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);
>
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2015-01-04 18:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-03 1:36 [PATCH V2 0/9] ARM: sirf: drop CSR marco and add atlas7 platform Barry Song
2015-01-03 1:36 ` [PATCH V2 1/9] ARM: sirf: drop MARCO low-level debug port Barry Song
2015-01-03 1:36 ` [PATCH V2 2/9] ARM: dts: drop MARCO platform DT stuff Barry Song
2015-01-03 1:36 ` [PATCH V2 3/9] ARM: sirf: drop MARCO support in reset controller module Barry Song
2015-01-03 1:36 ` [PATCH V2 4/9] ARM: sirf: drop MARCO machine Barry Song
2015-01-03 1:36 ` [PATCH V2 5/9] ARM: sirf: move platsmp to support atlas7 SoC Barry Song
2015-01-03 1:36 ` [PATCH V2 6/9] ARM: sirf: add two debug ports for CSRatlas7 SoC Barry Song
2015-01-04 16:55 ` Arnd Bergmann
2015-01-03 1:36 ` [PATCH V2 7/9] ARM: sirf: add atlas7 machine support Barry Song
2015-01-03 1:36 ` [PATCH V2 8/9] ARM: dts: add init dts file for CSR atlas7 SoC Barry Song
2015-01-03 1:36 ` [PATCH V2 9/9] clocksource: marco: rename marco to atlas7 Barry Song
2015-01-04 18:00 ` Daniel Lezcano [this message]
2015-01-04 16:56 ` [PATCH V2 0/9] ARM: sirf: drop CSR marco and add atlas7 platform Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54A97FC8.7000505@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.