| Message ID | 1353371237-2482-2-git-send-email-swarren@wwwdotorg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 19, 2012 at 05:27:17PM -0700, Stephen Warren wrote: > 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> > --- > v2: Rebase on ARM sys_timer rework, and addition of clocksource_of_init(). [..] > diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c > index aeec8d2..328d18f 100644 > --- a/drivers/clocksource/clksrc-of.c > +++ b/drivers/clocksource/clksrc-of.c > @@ -20,6 +20,10 @@ > #include "clksrc-of.h" > > static const struct of_device_id clksrc_of_match[] __initconst = { > + { > + .compatible = "nvidia,tegra20-timer", > + .data = tegra20_init_timer, > + }, Shouldn't this be wrapped in #if ARCH_TEGRA? I had suggested this with Thomas Petazzoni's consolidated irq_chip patch as well: It seems like it would be a bit cleaner/easier to maintain if we relied on the linker to stitch together a clksrc_of_match table, based on what clocksources are being built into the image. With that approach, at least, a public initialization header wouldn't have to be exposed, and this central table wouldn't have to be maintained (as more clocksrcs are added, I forsee [admittedly trivial] merge conflicts). Thoughts? Josh
Josh, On Mon, 19 Nov 2012 18:50:36 -0600, Josh Cartwright wrote: > I had suggested this with Thomas Petazzoni's consolidated irq_chip patch > as well: > > It seems like it would be a bit cleaner/easier to maintain if we relied > on the linker to stitch together a clksrc_of_match table, based on what > clocksources are being built into the image. With that approach, at > least, a public initialization header wouldn't have to be exposed, and > this central table wouldn't have to be maintained (as more clocksrcs are > added, I forsee [admittedly trivial] merge conflicts). ... and I indeed have a new version of my irqchip patches that indeed use the linker to merge together the of_device_id entries! Best regards, Thomas
On 11/19/2012 05:50 PM, Josh Cartwright wrote: > On Mon, Nov 19, 2012 at 05:27:17PM -0700, Stephen Warren wrote: >> 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> >> --- >> v2: Rebase on ARM sys_timer rework, and addition of clocksource_of_init(). > [..] >> diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c >> index aeec8d2..328d18f 100644 >> --- a/drivers/clocksource/clksrc-of.c >> +++ b/drivers/clocksource/clksrc-of.c >> @@ -20,6 +20,10 @@ >> #include "clksrc-of.h" >> >> static const struct of_device_id clksrc_of_match[] __initconst = { >> + { >> + .compatible = "nvidia,tegra20-timer", >> + .data = tegra20_init_timer, >> + }, > > Shouldn't this be wrapped in #if ARCH_TEGRA? Yes. > I had suggested this with Thomas Petazzoni's consolidated irq_chip patch > as well: > > It seems like it would be a bit cleaner/easier to maintain if we relied > on the linker to stitch together a clksrc_of_match table, based on what > clocksources are being built into the image. With that approach, at > least, a public initialization header wouldn't have to be exposed, and > this central table wouldn't have to be maintained (as more clocksrcs are > added, I forsee [admittedly trivial] merge conflicts). > > Thoughts? I thought I'd wait for Thomas' revised patch and copy that, but it turned out to be easier that I figured to implement. So, new revision coming soon!
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/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index aeec8d2..328d18f 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@ -20,6 +20,10 @@ #include "clksrc-of.h" static const struct of_device_id clksrc_of_match[] __initconst = { + { + .compatible = "nvidia,tegra20-timer", + .data = tegra20_init_timer, + }, { } }; diff --git a/drivers/clocksource/clksrc-of.h b/drivers/clocksource/clksrc-of.h index 4e2191a..386644d 100644 --- a/drivers/clocksource/clksrc-of.h +++ b/drivers/clocksource/clksrc-of.h @@ -17,4 +17,6 @@ #ifndef _CLKSRC_OF_H #define _CLKSRC_OF_H +void tegra20_init_timer(void); + #endif diff --git a/arch/arm/mach-tegra/timer.c b/drivers/clocksource/tegra20_timer.c similarity index 98% rename from arch/arm/mach-tegra/timer.c rename to drivers/clocksource/tegra20_timer.c index b0036e5..9d84096 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,7 +31,7 @@ #include <asm/smp_twd.h> #include <asm/sched_clock.h> -#include "board.h" +#include "clksrc-of.h" #define RTC_SECONDS 0x08 #define RTC_SHADOW_SECONDS 0x0c @@ -168,7 +166,7 @@ static const struct of_device_id rtc_match[] __initconst = { {} }; -void __init tegra_init_timer(void) +void __init tegra20_init_timer(void) { struct device_node *np; struct clk *clk;