From: Alexandre Belloni <alexandre.belloni@free-electrons.com> To: Nicolas Ferre <nicolas.ferre@atmel.com>, Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>, Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>, Wim Van Sebroeck <wim@iguana.be>, Guenter Roeck <linux@roeck-us.net>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Alexandre Belloni <alexandre.belloni@free-electrons.com> Subject: [PATCH v5 06/10] ARM: at91: properly initialize timer Date: Thu, 12 Mar 2015 13:07:30 +0100 [thread overview] Message-ID: <1426162054-9987-7-git-send-email-alexandre.belloni@free-electrons.com> (raw) In-Reply-To: <1426162054-9987-1-git-send-email-alexandre.belloni@free-electrons.com> Use clocksource_of_init to initialize the system timer instead of relying on a custom function. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-at91/at91rm9200.c | 7 ------- arch/arm/mach-at91/at91rm9200_time.c | 4 +++- arch/arm/mach-at91/generic.h | 3 --- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 2386d08d65e8..5efb075294e5 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -26,12 +26,6 @@ #include "generic.h" -static void __init at91rm9200_dt_timer_init(void) -{ - of_clk_init(NULL); - at91rm9200_timer_init(); -} - static void __init at91rm9200_dt_device_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); @@ -48,7 +42,6 @@ static const char *at91rm9200_dt_board_compat[] __initconst = { }; DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200") - .init_time = at91rm9200_dt_timer_init, .map_io = at91_map_io, .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat, diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index b00d09555f2b..7d062ab32674 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -222,7 +222,7 @@ err: /* * ST (system timer) module supports both clockevents and clocksource. */ -void __init at91rm9200_timer_init(void) +static void __init atmel_st_timer_init(struct device_node *node) { /* For device tree enabled device: initialize here */ of_at91rm9200_st_init(); @@ -249,3 +249,5 @@ void __init at91rm9200_timer_init(void) /* register clocksource */ clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK); } +CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", + atmel_st_timer_init); diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 583369ffc284..6c953bff13d6 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -18,9 +18,6 @@ extern void __init at91_map_io(void); extern void __init at91_alt_map_io(void); - /* Timer */ -extern void at91rm9200_timer_init(void); - /* idle */ extern void at91rm9200_idle(void); extern void at91sam9_idle(void); -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: alexandre.belloni@free-electrons.com (Alexandre Belloni) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 06/10] ARM: at91: properly initialize timer Date: Thu, 12 Mar 2015 13:07:30 +0100 [thread overview] Message-ID: <1426162054-9987-7-git-send-email-alexandre.belloni@free-electrons.com> (raw) In-Reply-To: <1426162054-9987-1-git-send-email-alexandre.belloni@free-electrons.com> Use clocksource_of_init to initialize the system timer instead of relying on a custom function. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-at91/at91rm9200.c | 7 ------- arch/arm/mach-at91/at91rm9200_time.c | 4 +++- arch/arm/mach-at91/generic.h | 3 --- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 2386d08d65e8..5efb075294e5 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -26,12 +26,6 @@ #include "generic.h" -static void __init at91rm9200_dt_timer_init(void) -{ - of_clk_init(NULL); - at91rm9200_timer_init(); -} - static void __init at91rm9200_dt_device_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); @@ -48,7 +42,6 @@ static const char *at91rm9200_dt_board_compat[] __initconst = { }; DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200") - .init_time = at91rm9200_dt_timer_init, .map_io = at91_map_io, .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat, diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index b00d09555f2b..7d062ab32674 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -222,7 +222,7 @@ err: /* * ST (system timer) module supports both clockevents and clocksource. */ -void __init at91rm9200_timer_init(void) +static void __init atmel_st_timer_init(struct device_node *node) { /* For device tree enabled device: initialize here */ of_at91rm9200_st_init(); @@ -249,3 +249,5 @@ void __init at91rm9200_timer_init(void) /* register clocksource */ clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK); } +CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", + atmel_st_timer_init); diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 583369ffc284..6c953bff13d6 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -18,9 +18,6 @@ extern void __init at91_map_io(void); extern void __init at91_alt_map_io(void); - /* Timer */ -extern void at91rm9200_timer_init(void); - /* idle */ extern void at91rm9200_idle(void); extern void at91sam9_idle(void); -- 2.1.0
next prev parent reply other threads:[~2015-03-12 12:08 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-12 12:07 [PATCH v5 00/10] Atmel System Timer cleanups Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 01/10] ARM: at91/dt: declare atmel,at91rm9200-st as a syscon Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 01/10] ARM: at91/dt: declare atmel, at91rm9200-st " Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 02/10] mfd: syscon: Add atmel system timer registers definition Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 8:03 ` Lee Jones 2015-03-13 8:03 ` Lee Jones 2015-03-13 8:03 ` Lee Jones 2015-03-13 10:40 ` Alexandre Belloni 2015-03-13 10:40 ` Alexandre Belloni 2015-03-13 16:52 ` Nicolas Ferre 2015-03-13 16:52 ` Nicolas Ferre 2015-03-13 16:52 ` Nicolas Ferre 2015-03-16 8:17 ` Lee Jones 2015-03-16 8:17 ` Lee Jones 2015-03-16 8:17 ` Lee Jones 2015-03-12 12:07 ` [PATCH v5 03/10] watchdog: at91rm9200: use the system timer syscon Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 16:19 ` Guenter Roeck 2015-03-12 16:19 ` Guenter Roeck 2015-03-12 12:07 ` [PATCH v5 04/10] watchdog: at91rm9200: implement restart handler Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 16:22 ` Guenter Roeck 2015-03-12 16:22 ` Guenter Roeck 2015-03-12 12:07 ` [PATCH v5 05/10] ARM: at91: at91rm9200: remove deprecated arm_pm_restart Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni [this message] 2015-03-12 12:07 ` [PATCH v5 06/10] ARM: at91: properly initialize timer Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 07/10] ARM: at91: time: move the system timer driver to drivers/clocksource Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:14 ` Daniel Lezcano 2015-03-13 10:14 ` Daniel Lezcano 2015-03-13 10:14 ` Daniel Lezcano 2015-03-12 12:07 ` [PATCH v5 08/10] clocksource: atmel-st: use syscon/regmap Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:17 ` Daniel Lezcano 2015-03-13 10:17 ` Daniel Lezcano 2015-03-13 10:17 ` Daniel Lezcano 2015-03-12 12:07 ` [PATCH v5 09/10] clocksource: atmel-st: remove mach/hardware dependency Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:21 ` Daniel Lezcano 2015-03-13 10:21 ` Daniel Lezcano 2015-03-13 10:21 ` Daniel Lezcano 2015-03-13 10:44 ` Alexandre Belloni 2015-03-13 10:44 ` Alexandre Belloni 2015-03-13 10:54 ` [PATCH v6 " Alexandre Belloni 2015-03-13 10:54 ` Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 10/10] ARM: at91: remove useless include Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:22 ` Daniel Lezcano 2015-03-13 10:22 ` Daniel Lezcano 2015-03-13 10:22 ` Daniel Lezcano 2015-03-12 14:04 ` [PATCH v5 00/10] Atmel System Timer cleanups Nicolas Ferre 2015-03-12 14:04 ` Nicolas Ferre 2015-03-12 14:04 ` Nicolas Ferre 2015-03-13 10:23 ` Daniel Lezcano 2015-03-13 10:23 ` Daniel Lezcano 2015-03-13 10:23 ` Daniel Lezcano 2015-03-13 10:33 ` Alexandre Belloni 2015-03-13 10:33 ` Alexandre Belloni 2015-03-13 10:33 ` Daniel Lezcano 2015-03-13 10:33 ` Daniel Lezcano 2015-03-13 10:33 ` Daniel Lezcano 2015-03-13 16:36 ` Nicolas Ferre 2015-03-13 16:36 ` Nicolas Ferre 2015-03-13 16:36 ` Nicolas Ferre
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=1426162054-9987-7-git-send-email-alexandre.belloni@free-electrons.com \ --to=alexandre.belloni@free-electrons.com \ --cc=boris.brezillon@free-electrons.com \ --cc=daniel.lezcano@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=nicolas.ferre@atmel.com \ --cc=plagnioj@jcrosoft.com \ --cc=wim@iguana.be \ /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: linkBe 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.