| Message ID | c0347788fbad559a249a25128a23f40c85d9cbda.1351721190.git.josh.cartwright@ni.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2012/10/29 Josh Cartwright <josh.cartwright@ni.com>: > Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to > drivers/clocksource, and out of the mach-zynq directory. > > The common.h (which only held the timer declaration) was renamed to > xilinx_ttc.h and moved into include/linux. > > Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> > Cc: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/mach-zynq/Makefile | 2 +- > arch/arm/mach-zynq/common.c | 2 +- > drivers/clocksource/Makefile | 1 + > arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - > arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- > 5 files changed, 5 insertions(+), 5 deletions(-) > rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) > rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%) Not going to apply this patch till there is clean way how to move all drivers there. Especially I don't like to add xilinx_ttc.h to include/linux folder. Thanks, Michal
On 11/05/2012 05:22 AM, Michal Simek wrote: > 2012/10/29 Josh Cartwright <josh.cartwright@ni.com>: >> Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to >> drivers/clocksource, and out of the mach-zynq directory. >> >> The common.h (which only held the timer declaration) was renamed to >> xilinx_ttc.h and moved into include/linux. >> >> Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> >> Cc: Arnd Bergmann <arnd@arndb.de> >> --- >> arch/arm/mach-zynq/Makefile | 2 +- >> arch/arm/mach-zynq/common.c | 2 +- >> drivers/clocksource/Makefile | 1 + >> arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - >> arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- >> 5 files changed, 5 insertions(+), 5 deletions(-) >> rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) >> rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%) > > Not going to apply this patch till there is clean way how to move all > drivers there. > Especially I don't like to add xilinx_ttc.h to include/linux folder. > A cleaner way is how we are doing irqchips [1]. This needs a single function (or one each for clksrc and clkevt) that has a DT match list of all known timers and calls their init function. It should be a bit simpler than irqchips init function because you don't need to worry about hierarchy init ordering. That doesn't solve non-DT though and if there are any extra functions like we have with irqchips, you still need the header in include/linux. Rob [1] http://www.spinics.net/lists/arm-kernel/msg203687.html
On Mon, Nov 05, 2012 at 12:22:55PM +0100, Michal Simek wrote: > 2012/10/29 Josh Cartwright <josh.cartwright@ni.com>: > > Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to > > drivers/clocksource, and out of the mach-zynq directory. > > > > The common.h (which only held the timer declaration) was renamed to > > xilinx_ttc.h and moved into include/linux. > > > > Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> > > Cc: Arnd Bergmann <arnd@arndb.de> > > --- > > arch/arm/mach-zynq/Makefile | 2 +- > > arch/arm/mach-zynq/common.c | 2 +- > > drivers/clocksource/Makefile | 1 + > > arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - > > arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- > > 5 files changed, 5 insertions(+), 5 deletions(-) > > rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) > > rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%) > > Not going to apply this patch till there is clean way how to move all > drivers there. Especially I don't like to add xilinx_ttc.h to > include/linux folder. Okay; I think it's best to defer the moving of the ttc driver from this patchset. It is not a dependency of the clk driver support stuff. If you agree, I can spin up a v2 of the patchset w/o this change, and without the serial CONFIG_OF stuff. Should v2 contain the patches you've already pulled into testing? I'll give Rob's irqchip-like suggestion a spin and see how that works out in parallel. Thanks, Josh
2012/11/5 Josh Cartwright <josh.cartwright@ni.com>: > On Mon, Nov 05, 2012 at 12:22:55PM +0100, Michal Simek wrote: >> 2012/10/29 Josh Cartwright <josh.cartwright@ni.com>: >> > Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to >> > drivers/clocksource, and out of the mach-zynq directory. >> > >> > The common.h (which only held the timer declaration) was renamed to >> > xilinx_ttc.h and moved into include/linux. >> > >> > Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> >> > Cc: Arnd Bergmann <arnd@arndb.de> >> > --- >> > arch/arm/mach-zynq/Makefile | 2 +- >> > arch/arm/mach-zynq/common.c | 2 +- >> > drivers/clocksource/Makefile | 1 + >> > arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - >> > arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- >> > 5 files changed, 5 insertions(+), 5 deletions(-) >> > rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) >> > rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%) >> >> Not going to apply this patch till there is clean way how to move all >> drivers there. Especially I don't like to add xilinx_ttc.h to >> include/linux folder. > > Okay; I think it's best to defer the moving of the ttc driver from this > patchset. It is not a dependency of the clk driver support stuff. > If you agree, I can spin up a v2 of the patchset w/o this change, and > without the serial CONFIG_OF stuff. Should v2 contain the patches > you've already pulled into testing? Sure and I see you have done which is good. Thanks, Michal
diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index 397268c..320faed 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile @@ -3,4 +3,4 @@ # # Common support -obj-y := common.o timer.o +obj-y := common.o diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 6f058258..0279ea7 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -22,6 +22,7 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/of.h> +#include <linux/xilinx_ttc.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -32,7 +33,6 @@ #include <asm/hardware/cache-l2x0.h> #include <mach/zynq_soc.h> -#include "common.h" static struct of_device_id zynq_of_bus_ids[] __initdata = { { .compatible = "simple-bus", }, diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 603be36..f27c7b1 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -14,5 +14,6 @@ obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.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_ZYNQ) += xilinx_ttc.o obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o diff --git a/arch/arm/mach-zynq/timer.c b/drivers/clocksource/xilinx_ttc.c similarity index 99% rename from arch/arm/mach-zynq/timer.c rename to drivers/clocksource/xilinx_ttc.c index c93cbe5..ff38b3e 100644 --- a/arch/arm/mach-zynq/timer.c +++ b/drivers/clocksource/xilinx_ttc.c @@ -25,7 +25,6 @@ #include <linux/io.h> #include <mach/zynq_soc.h> -#include "common.h" #define IRQ_TIMERCOUNTER0 42 diff --git a/arch/arm/mach-zynq/common.h b/include/linux/xilinx_ttc.h similarity index 91% rename from arch/arm/mach-zynq/common.h rename to include/linux/xilinx_ttc.h index 954b91c..303a3fd 100644 --- a/arch/arm/mach-zynq/common.h +++ b/include/linux/xilinx_ttc.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef __MACH_ZYNQ_COMMON_H__ -#define __MACH_ZYNQ_COMMON_H__ +#ifndef __XILINX_TTC_H__ +#define __XILINX_TTC_H__ void __init xttcpss_timer_init(void);
Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to drivers/clocksource, and out of the mach-zynq directory. The common.h (which only held the timer declaration) was renamed to xilinx_ttc.h and moved into include/linux. Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> Cc: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-zynq/Makefile | 2 +- arch/arm/mach-zynq/common.c | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%)