* [PATCH V3 2/2] ARM: tegra: move timer.c to drivers/clocksource/
2012-11-20 19:20 [PATCH V3 1/2] clocksource: add common of_clksrc_init() function Stephen Warren
@ 2012-11-20 19:20 ` Stephen Warren
2012-11-20 19:31 ` [PATCH V3 1/2] clocksource: add common of_clksrc_init() function Thomas Petazzoni
2012-11-20 20:10 ` Josh Cartwright
2 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-11-20 19:20 UTC (permalink / raw)
To: linux-arm-kernel
From: Stephen Warren <swarren@nvidia.com>
Move arch/arm/mach-tegra/timer.c to drivers/clocksource/tegra20_timer.c
so that the code is co-located with other clocksource drivers, and to
reduce the size of the mach-tegra directory.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v3: Rework using CLKSRC_OF_MATCH_TABLE() for registration, rather than a
manually maintained table in clksrc-of.c.
v2: Rebase on ARM sys_timer rework, and addition of clocksource_of_init().
---
arch/arm/Kconfig | 1 +
arch/arm/mach-tegra/Makefile | 1 -
arch/arm/mach-tegra/board-dt-tegra20.c | 3 ++-
arch/arm/mach-tegra/board-dt-tegra30.c | 3 ++-
arch/arm/mach-tegra/board.h | 1 -
drivers/clocksource/Makefile | 1 +
.../timer.c => drivers/clocksource/tegra20_timer.c | 12 +++++++-----
7 files changed, 13 insertions(+), 9 deletions(-)
rename arch/arm/mach-tegra/timer.c => drivers/clocksource/tegra20_timer.c (96%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 14f8160..9eb54f6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -633,6 +633,7 @@ config ARCH_TEGRA
select ARCH_HAS_CPUFREQ
select CLKDEV_LOOKUP
select CLKSRC_MMIO
+ select CLKSRC_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select GENERIC_GPIO
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 6f224f7..6ab3ed5 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -2,7 +2,6 @@ obj-y += common.o
obj-y += io.o
obj-y += irq.o
obj-y += clock.o
-obj-y += timer.o
obj-y += fuse.o
obj-y += pmc.o
obj-y += flowctrl.o
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index 794a7bf..0bee85a 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -15,6 +15,7 @@
*
*/
+#include <linux/clocksource.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@ -194,7 +195,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")
.init_early = tegra20_init_early,
.init_irq = tegra_dt_init_irq,
.handle_irq = gic_handle_irq,
- .init_time = tegra_init_timer,
+ .init_time = clocksource_of_init,
.init_machine = tegra_dt_init,
.init_late = tegra_dt_init_late,
.restart = tegra_assert_system_reset,
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c
index 08d3b19..a2b6cf1 100644
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@ -23,6 +23,7 @@
*
*/
+#include <linux/clocksource.h>
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_address.h>
@@ -104,7 +105,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")
.init_early = tegra30_init_early,
.init_irq = tegra_dt_init_irq,
.handle_irq = gic_handle_irq,
- .init_time = tegra_init_timer,
+ .init_time = clocksource_of_init,
.init_machine = tegra30_dt_init,
.init_late = tegra_init_late,
.restart = tegra_assert_system_reset,
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 744cdd2..da8f5a3 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -55,5 +55,4 @@ static inline int harmony_pcie_init(void) { return 0; }
void __init tegra_paz00_wifikill_init(void);
-extern void tegra_init_timer(void);
#endif
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 29017a3..ecf37f3 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -16,5 +16,6 @@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o
obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o
obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o
obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o
+obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o
obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o
diff --git a/arch/arm/mach-tegra/timer.c b/drivers/clocksource/tegra20_timer.c
similarity index 96%
rename from arch/arm/mach-tegra/timer.c
rename to drivers/clocksource/tegra20_timer.c
index b0036e5..13636a4 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -1,6 +1,4 @@
/*
- * arch/arch/mach-tegra/timer.c
- *
* Copyright (C) 2010 Google, Inc.
*
* Author:
@@ -33,8 +31,6 @@
#include <asm/smp_twd.h>
#include <asm/sched_clock.h>
-#include "board.h"
-
#define RTC_SECONDS 0x08
#define RTC_SHADOW_SECONDS 0x0c
#define RTC_MILLISECONDS 0x10
@@ -168,7 +164,7 @@ static const struct of_device_id rtc_match[] __initconst = {
{}
};
-void __init tegra_init_timer(void)
+static void __init tegra20_init_timer(void)
{
struct device_node *np;
struct clk *clk;
@@ -286,3 +282,9 @@ void tegra_timer_resume(void)
timer_writel(usec_config, TIMERUS_USEC_CFG);
}
#endif
+
+static const struct of_device_id tegra20_timer_match[] __initconst = {
+ { .compatible = "nvidia,tegra20-timer", .data = tegra20_init_timer },
+ {}
+};
+CLKSRC_OF_MATCH_TABLE(tegra20, tegra20_timer_match);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V3 1/2] clocksource: add common of_clksrc_init() function
2012-11-20 19:20 [PATCH V3 1/2] clocksource: add common of_clksrc_init() function Stephen Warren
2012-11-20 19:20 ` [PATCH V3 2/2] ARM: tegra: move timer.c to drivers/clocksource/ Stephen Warren
@ 2012-11-20 19:31 ` Thomas Petazzoni
2012-11-20 19:45 ` Stephen Warren
2012-11-20 20:10 ` Josh Cartwright
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2012-11-20 19:31 UTC (permalink / raw)
To: linux-arm-kernel
Stephen,
On Tue, 20 Nov 2012 12:20:05 -0700, Stephen Warren wrote:
> It is desirable to move all clocksource drivers to drivers/clocksource,
> yet each requires its own initialization function. We'd rather not
> pollute <linux/> with a header for each function. Instead, create a
> single of_clksrc_init() function which will determine which clocksource
> driver to initialize based on device tree.
Sounds great!
I'm still planning to send irqchip soon, but I've been busy preparing
things for the merge window in the mvebu architecture, which has been
quite active during this cycle.
> +#include <linux/init.h>
> +#include <linux/of.h>
> +
> +extern struct of_device_id *__start_clksrc_of_match_tables[];
> +extern struct of_device_id *__stop_clksrc_of_match_tables[];
> +
> +void __init clocksource_of_init(void)
> +{
> + struct of_device_id **table;
> + struct of_device_id **stop;
> + struct device_node *np;
> + const struct of_device_id *match;
> + void (*init_func)(void);
> +
> + table = __start_clksrc_of_match_tables;
> + stop = __stop_clksrc_of_match_tables;
> +
> + for ( ; table < stop; table++) {
> + for_each_matching_node(np, *table) {
> + match = of_match_node(*table, np);
> + init_func = match->data;
> + init_func();
> + }
> + }
> +}
The way I did things for irqchip is a bit different: I used the
standard of_irq_init(), which requires a table that is terminated by a
sentinel. In order to guarantee that I have a sentinel, I did:
#define IRQCHIP_DECLARE(compstr,fn) \
static const struct of_device_id irqchip_of_match \
__used __section(.init.irqchip) \
= { .compatible = compstr, .data = fn }
which is used to declare all irq drivers. But then in the main
irqchip.c file, I did:
static const struct of_device_id
irqchip_of_match_end __used __section(.init.irqchip.end);
and my linker script looks like:
.init.irqchip : {
__irqchip_begin = .;
*(.init.irqchip)
*(.init.irqchip.end)
}
So I gather all the of_device_id definitions and then the special
sentinel of_device_id. I don't know if it is better than your solution,
or even if my solution is good at all.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH V3 1/2] clocksource: add common of_clksrc_init() function
2012-11-20 19:20 [PATCH V3 1/2] clocksource: add common of_clksrc_init() function Stephen Warren
2012-11-20 19:20 ` [PATCH V3 2/2] ARM: tegra: move timer.c to drivers/clocksource/ Stephen Warren
2012-11-20 19:31 ` [PATCH V3 1/2] clocksource: add common of_clksrc_init() function Thomas Petazzoni
@ 2012-11-20 20:10 ` Josh Cartwright
2012-11-20 20:38 ` Stephen Warren
2 siblings, 1 reply; 6+ messages in thread
From: Josh Cartwright @ 2012-11-20 20:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 20, 2012 at 12:20:05PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> It is desirable to move all clocksource drivers to drivers/clocksource,
> yet each requires its own initialization function. We'd rather not
> pollute <linux/> with a header for each function. Instead, create a
> single of_clksrc_init() function which will determine which clocksource
> driver to initialize based on device tree.
>
> Inspired by a similar patch for drivers/irqchip by Thomas Petazzoni.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> v3: Use a linker section to replace manually maintained table.
> v2: New patch.
>
[..]
> --- /dev/null
> +++ b/drivers/clocksource/clksrc-of.c
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/of.h>
> +
> +extern struct of_device_id *__start_clksrc_of_match_tables[];
> +extern struct of_device_id *__stop_clksrc_of_match_tables[];
> +
> +void __init clocksource_of_init(void)
> +{
> + struct of_device_id **table;
> + struct of_device_id **stop;
> + struct device_node *np;
> + const struct of_device_id *match;
> + void (*init_func)(void);
> +
> + table = __start_clksrc_of_match_tables;
> + stop = __stop_clksrc_of_match_tables;
> +
> + for ( ; table < stop; table++) {
> + for_each_matching_node(np, *table) {
> + match = of_match_node(*table, np);
> + init_func = match->data;
> + init_func();
Hmm. Am I crazy, or does this for_each_matching_node()/of_match_node()
pattern end up walking the match table twice, unnecessarily?
I'm wondering if we can come up with a for_each_matching_node_id() macro
that also provides a pointer to the matching of_device_id...
Josh
^ permalink raw reply [flat|nested] 6+ messages in thread