| Message ID | 1364218233-29636-4-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/25/2013 08:30 AM, Maxime Ripard wrote: > Using CLKSRC_OF allows to remove the SoC specific sunxi_timer.h header, > and instead of using a custom init function in the machine definition > use the standard clocksource_of_init function. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> [...] > @@ -158,3 +157,5 @@ void __init sunxi_timer_init(void) > clockevents_config_and_register(&sunxi_clockevent, rate / TIMER_SCAL, > 0x1, 0xff); > } > +CLOCKSOURCE_OF_DECLARE(sunxi, "allwinner,sun4i-timer", > + sunxi_timer_init); You should base this on clocksource clean-up branch "clksrc/cleanup" in arm-soc. That will get rid of double matching and match table. Also, sunxi_timer_init can be static now. Rob
Hi Rob, Le 25/03/2013 14:50, Rob Herring a écrit : > On 03/25/2013 08:30 AM, Maxime Ripard wrote: >> Using CLKSRC_OF allows to remove the SoC specific sunxi_timer.h header, >> and instead of using a custom init function in the machine definition >> use the standard clocksource_of_init function. >> >> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > [...] > >> @@ -158,3 +157,5 @@ void __init sunxi_timer_init(void) >> clockevents_config_and_register(&sunxi_clockevent, rate / TIMER_SCAL, >> 0x1, 0xff); >> } >> +CLOCKSOURCE_OF_DECLARE(sunxi, "allwinner,sun4i-timer", >> + sunxi_timer_init); > > You should base this on clocksource clean-up branch "clksrc/cleanup" in > arm-soc. That will get rid of double matching and match table. > > Also, sunxi_timer_init can be static now. Ah, thanks, I missed these patches. I'll do that and send a v2. Maxime
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 8709a39..06c2894 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1,6 +1,7 @@ config ARCH_SUNXI bool "Allwinner A1X SOCs" if ARCH_MULTI_V7 select CLKSRC_MMIO + select CLKSRC_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 23afb73..2c01182 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -10,6 +10,7 @@ * warranty of any kind, whether express or implied. */ +#include <linux/clocksource.h> #include <linux/delay.h> #include <linux/kernel.h> #include <linux/init.h> @@ -17,7 +18,6 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/io.h> -#include <linux/sunxi_timer.h> #include <linux/irqchip/sunxi.h> @@ -100,6 +100,6 @@ DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") .init_irq = sunxi_init_irq, .handle_irq = sunxi_handle_irq, .restart = sunxi_restart, - .init_time = &sunxi_timer_init, + .init_time = clocksource_of_init, .dt_compat = sunxi_board_dt_compat, MACHINE_END diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c index 7a3ea23..0b46b7f 100644 --- a/drivers/clocksource/sunxi_timer.c +++ b/drivers/clocksource/sunxi_timer.c @@ -22,7 +22,6 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> -#include <linux/sunxi_timer.h> #include <linux/clk/sunxi.h> #define TIMER_IRQ_EN_REG 0x00 @@ -158,3 +157,5 @@ void __init sunxi_timer_init(void) clockevents_config_and_register(&sunxi_clockevent, rate / TIMER_SCAL, 0x1, 0xff); } +CLOCKSOURCE_OF_DECLARE(sunxi, "allwinner,sun4i-timer", + sunxi_timer_init); diff --git a/include/linux/sunxi_timer.h b/include/linux/sunxi_timer.h deleted file mode 100644 index 1808178..0000000 --- a/include/linux/sunxi_timer.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2012 Maxime Ripard - * - * Maxime Ripard <maxime.ripard@free-electrons.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that 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. - */ - -#ifndef __SUNXI_TIMER_H -#define __SUNXI_TIMER_H - -#include <asm/mach/time.h> - -void sunxi_timer_init(void); - -#endif
Using CLKSRC_OF allows to remove the SoC specific sunxi_timer.h header, and instead of using a custom init function in the machine definition use the standard clocksource_of_init function. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/mach-sunxi/Kconfig | 1 + arch/arm/mach-sunxi/sunxi.c | 4 ++-- drivers/clocksource/sunxi_timer.c | 3 ++- include/linux/sunxi_timer.h | 24 ------------------------ 4 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 include/linux/sunxi_timer.h