* [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE [not found] <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> @ 2017-05-27 9:58 ` Daniel Lezcano 2017-05-28 13:48 ` Linus Walleij ` (6 more replies) 2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano 1 sibling, 7 replies; 19+ messages in thread From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw) To: tglx, daniel.lezcano Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the clocksource at early stage. However, this macro is also used to initialize the clockevent if any, or the clockevent only. It was originally suggested to declare another macro to initialize a clockevent, so in order to separate the two entities even they belong to the same IP. This was not accepted because of the impact on the DT where splitting a clocksource/clockevent definition does not make sense as it is a Linux concept not a hardware description. On the other side, the clocksource has not interrupt declared while the clockevent has, so it is easy from the driver to know if the description is for a clockevent or a clocksource, IOW it could be implemented at the driver level. So instead of dealing with a named clocksource macro, let's use a more generic one: TIMER_OF_DECLARE. The patch has not functional changes. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/kernel/smp_twd.c | 6 +++--- arch/microblaze/kernel/timer.c | 2 +- arch/mips/ralink/cevt-rt3352.c | 2 +- arch/nios2/kernel/time.c | 2 +- drivers/clocksource/arc_timer.c | 6 +++--- drivers/clocksource/arm_arch_timer.c | 6 +++--- drivers/clocksource/arm_global_timer.c | 2 +- drivers/clocksource/armv7m_systick.c | 2 +- drivers/clocksource/asm9260_timer.c | 2 +- drivers/clocksource/bcm2835_timer.c | 2 +- drivers/clocksource/bcm_kona_timer.c | 4 ++-- drivers/clocksource/cadence_ttc_timer.c | 2 +- drivers/clocksource/clksrc-dbx500-prcmu.c | 2 +- drivers/clocksource/clksrc_st_lpc.c | 2 +- drivers/clocksource/clps711x-timer.c | 2 +- drivers/clocksource/dw_apb_timer_of.c | 8 ++++---- drivers/clocksource/exynos_mct.c | 4 ++-- drivers/clocksource/fsl_ftm_timer.c | 2 +- drivers/clocksource/h8300_timer16.c | 2 +- drivers/clocksource/h8300_timer8.c | 2 +- drivers/clocksource/h8300_tpu.c | 2 +- drivers/clocksource/jcore-pit.c | 2 +- drivers/clocksource/meson6_timer.c | 2 +- drivers/clocksource/mips-gic-timer.c | 2 +- drivers/clocksource/mps2-timer.c | 2 +- drivers/clocksource/mtk_timer.c | 2 +- drivers/clocksource/mxs_timer.c | 2 +- drivers/clocksource/nomadik-mtu.c | 2 +- drivers/clocksource/pxa_timer.c | 2 +- drivers/clocksource/qcom-timer.c | 4 ++-- drivers/clocksource/renesas-ostm.c | 2 +- drivers/clocksource/rockchip_timer.c | 4 ++-- drivers/clocksource/samsung_pwm_timer.c | 8 ++++---- drivers/clocksource/sun4i_timer.c | 2 +- drivers/clocksource/tango_xtal.c | 2 +- drivers/clocksource/tegra20_timer.c | 4 ++-- drivers/clocksource/time-armada-370-xp.c | 6 +++--- drivers/clocksource/time-efm32.c | 4 ++-- drivers/clocksource/time-lpc32xx.c | 2 +- drivers/clocksource/time-orion.c | 2 +- drivers/clocksource/time-pistachio.c | 2 +- drivers/clocksource/timer-atlas7.c | 2 +- drivers/clocksource/timer-atmel-pit.c | 2 +- drivers/clocksource/timer-atmel-st.c | 2 +- drivers/clocksource/timer-digicolor.c | 2 +- drivers/clocksource/timer-fttmr010.c | 10 +++++----- drivers/clocksource/timer-imx-gpt.c | 24 ++++++++++++------------ drivers/clocksource/timer-integrator-ap.c | 2 +- drivers/clocksource/timer-keystone.c | 2 +- drivers/clocksource/timer-nps.c | 6 +++--- drivers/clocksource/timer-oxnas-rps.c | 4 ++-- drivers/clocksource/timer-prima2.c | 2 +- drivers/clocksource/timer-sp804.c | 4 ++-- drivers/clocksource/timer-stm32.c | 2 +- drivers/clocksource/timer-sun5i.c | 4 ++-- drivers/clocksource/timer-ti-32k.c | 2 +- drivers/clocksource/timer-u300.c | 2 +- drivers/clocksource/versatile.c | 4 ++-- drivers/clocksource/vf_pit_timer.c | 2 +- drivers/clocksource/vt8500_timer.c | 2 +- drivers/clocksource/zevio-timer.c | 2 +- include/linux/clocksource.h | 2 +- 62 files changed, 103 insertions(+), 103 deletions(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 895ae51..b30eafe 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -403,7 +403,7 @@ static int __init twd_local_timer_of_register(struct device_node *np) WARN(err, "twd_local_timer_of_register failed (%d)\n", err); return err; } -CLOCKSOURCE_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); -CLOCKSOURCE_OF_DECLARE(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); -CLOCKSOURCE_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); +TIMER_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); +TIMER_OF_DECLARE(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); +TIMER_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); #endif diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index 9990661..873a1cc 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -333,5 +333,5 @@ static int __init xilinx_timer_init(struct device_node *timer) return 0; } -CLOCKSOURCE_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a", +TIMER_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a", xilinx_timer_init); diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c index b8a1376..92f284d 100644 --- a/arch/mips/ralink/cevt-rt3352.c +++ b/arch/mips/ralink/cevt-rt3352.c @@ -152,4 +152,4 @@ static int __init ralink_systick_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); +TIMER_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c index 6e2bdc9..2954b66 100644 --- a/arch/nios2/kernel/time.c +++ b/arch/nios2/kernel/time.c @@ -353,4 +353,4 @@ void __init time_init(void) clocksource_probe(); } -CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); +TIMER_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c index 2164973..4927355 100644 --- a/drivers/clocksource/arc_timer.c +++ b/drivers/clocksource/arc_timer.c @@ -99,7 +99,7 @@ static int __init arc_cs_setup_gfrc(struct device_node *node) return clocksource_register_hz(&arc_counter_gfrc, arc_timer_freq); } -CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); +TIMER_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); #define AUX_RTC_CTRL 0x103 #define AUX_RTC_LOW 0x104 @@ -158,7 +158,7 @@ static int __init arc_cs_setup_rtc(struct device_node *node) return clocksource_register_hz(&arc_counter_rtc, arc_timer_freq); } -CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); +TIMER_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); #endif @@ -333,4 +333,4 @@ static int __init arc_of_timer_init(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init); +TIMER_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init); diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a1fb918..9a41958 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1194,8 +1194,8 @@ static int __init arch_timer_of_init(struct device_node *np) return arch_timer_common_init(); } -CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init); -CLOCKSOURCE_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init); +TIMER_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init); +TIMER_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init); static u32 __init arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame) @@ -1382,7 +1382,7 @@ static int __init arch_timer_mem_of_init(struct device_node *np) kfree(timer_mem); return ret; } -CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", +TIMER_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_of_init); #ifdef CONFIG_ACPI_GTDT diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index 123ed20..095bb96 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c @@ -339,5 +339,5 @@ static int __init global_timer_of_register(struct device_node *np) } /* Only tested on r2p2 and r3p0 */ -CLOCKSOURCE_OF_DECLARE(arm_gt, "arm,cortex-a9-global-timer", +TIMER_OF_DECLARE(arm_gt, "arm,cortex-a9-global-timer", global_timer_of_register); diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c index a315491..ac046d6 100644 --- a/drivers/clocksource/armv7m_systick.c +++ b/drivers/clocksource/armv7m_systick.c @@ -82,5 +82,5 @@ static int __init system_timer_of_register(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(arm_systick, "arm,armv7m-systick", +TIMER_OF_DECLARE(arm_systick, "arm,armv7m-systick", system_timer_of_register); diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c index c678083..38cd2fe 100644 --- a/drivers/clocksource/asm9260_timer.c +++ b/drivers/clocksource/asm9260_timer.c @@ -238,5 +238,5 @@ static int __init asm9260_timer_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(asm9260_timer, "alphascale,asm9260-timer", +TIMER_OF_DECLARE(asm9260_timer, "alphascale,asm9260-timer", asm9260_timer_init); diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index dce4430..82828d3 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c @@ -148,5 +148,5 @@ static int __init bcm2835_timer_init(struct device_node *node) iounmap(base); return ret; } -CLOCKSOURCE_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer", +TIMER_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer", bcm2835_timer_init); diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c index fda5e147..5c40be9 100644 --- a/drivers/clocksource/bcm_kona_timer.c +++ b/drivers/clocksource/bcm_kona_timer.c @@ -198,9 +198,9 @@ static int __init kona_timer_init(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(brcm_kona, "brcm,kona-timer", kona_timer_init); +TIMER_OF_DECLARE(brcm_kona, "brcm,kona-timer", kona_timer_init); /* * bcm,kona-timer is deprecated by brcm,kona-timer * being kept here for driver compatibility */ -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init); +TIMER_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init); diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c index 44e5e95..a144dfc 100644 --- a/drivers/clocksource/cadence_ttc_timer.c +++ b/drivers/clocksource/cadence_ttc_timer.c @@ -539,4 +539,4 @@ static int __init ttc_timer_init(struct device_node *timer) return 0; } -CLOCKSOURCE_OF_DECLARE(ttc, "cdns,ttc", ttc_timer_init); +TIMER_OF_DECLARE(ttc, "cdns,ttc", ttc_timer_init); diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index c69e277..c1b96dc 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -86,5 +86,5 @@ static int __init clksrc_dbx500_prcmu_init(struct device_node *node) #endif return clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); } -CLOCKSOURCE_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", +TIMER_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", clksrc_dbx500_prcmu_init); diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c index 03cc492..a1d01eb 100644 --- a/drivers/clocksource/clksrc_st_lpc.c +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -132,4 +132,4 @@ static int __init st_clksrc_of_register(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); +TIMER_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c index 24db6d6..fc9e025 100644 --- a/drivers/clocksource/clps711x-timer.c +++ b/drivers/clocksource/clps711x-timer.c @@ -119,5 +119,5 @@ static int __init clps711x_timer_init(struct device_node *np) return -EINVAL; } } -CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init); +TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init); #endif diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c index aee6c0d..69866cd 100644 --- a/drivers/clocksource/dw_apb_timer_of.c +++ b/drivers/clocksource/dw_apb_timer_of.c @@ -167,7 +167,7 @@ static int __init dw_apb_timer_init(struct device_node *timer) return 0; } -CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init); +TIMER_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); +TIMER_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); +TIMER_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); +TIMER_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init); diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 670ff0f..7a244b6 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -610,5 +610,5 @@ static int __init mct_init_ppi(struct device_node *np) { return mct_init_dt(np, MCT_INT_PPI); } -CLOCKSOURCE_OF_DECLARE(exynos4210, "samsung,exynos4210-mct", mct_init_spi); -CLOCKSOURCE_OF_DECLARE(exynos4412, "samsung,exynos4412-mct", mct_init_ppi); +TIMER_OF_DECLARE(exynos4210, "samsung,exynos4210-mct", mct_init_spi); +TIMER_OF_DECLARE(exynos4412, "samsung,exynos4412-mct", mct_init_ppi); diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 738515b..3121e2d 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -369,4 +369,4 @@ static int __init ftm_timer_init(struct device_node *np) kfree(priv); return ret; } -CLOCKSOURCE_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init); +TIMER_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init); diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c index 5b27fb9..dfbd4f8 100644 --- a/drivers/clocksource/h8300_timer16.c +++ b/drivers/clocksource/h8300_timer16.c @@ -187,5 +187,5 @@ static int __init h8300_16timer_init(struct device_node *node) return ret; } -CLOCKSOURCE_OF_DECLARE(h8300_16bit, "renesas,16bit-timer", +TIMER_OF_DECLARE(h8300_16bit, "renesas,16bit-timer", h8300_16timer_init); diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c index 804c489..f6ffb0c 100644 --- a/drivers/clocksource/h8300_timer8.c +++ b/drivers/clocksource/h8300_timer8.c @@ -207,4 +207,4 @@ static int __init h8300_8timer_init(struct device_node *node) return ret; } -CLOCKSOURCE_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init); +TIMER_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init); diff --git a/drivers/clocksource/h8300_tpu.c b/drivers/clocksource/h8300_tpu.c index 72e1cf2..45a8d17 100644 --- a/drivers/clocksource/h8300_tpu.c +++ b/drivers/clocksource/h8300_tpu.c @@ -154,4 +154,4 @@ static int __init h8300_tpu_init(struct device_node *node) return ret; } -CLOCKSOURCE_OF_DECLARE(h8300_tpu, "renesas,tpu", h8300_tpu_init); +TIMER_OF_DECLARE(h8300_tpu, "renesas,tpu", h8300_tpu_init); diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c index 7c61226..5d3d88e0f 100644 --- a/drivers/clocksource/jcore-pit.c +++ b/drivers/clocksource/jcore-pit.c @@ -246,4 +246,4 @@ static int __init jcore_pit_init(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init); +TIMER_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init); diff --git a/drivers/clocksource/meson6_timer.c b/drivers/clocksource/meson6_timer.c index 39d21f6..92f2099 100644 --- a/drivers/clocksource/meson6_timer.c +++ b/drivers/clocksource/meson6_timer.c @@ -174,5 +174,5 @@ static int __init meson6_timer_init(struct device_node *node) 1, 0xfffe); return 0; } -CLOCKSOURCE_OF_DECLARE(meson6, "amlogic,meson6-timer", +TIMER_OF_DECLARE(meson6, "amlogic,meson6-timer", meson6_timer_init); diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index 3f52ee2..e31e083 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -200,5 +200,5 @@ static int __init gic_clocksource_of_init(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer", +TIMER_OF_DECLARE(mips_gic_timer, "mti,gic-timer", gic_clocksource_of_init); diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c index 3e4431e..aa4d63af 100644 --- a/drivers/clocksource/mps2-timer.c +++ b/drivers/clocksource/mps2-timer.c @@ -274,4 +274,4 @@ static int __init mps2_timer_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); +TIMER_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c index 9065949..f9b724f 100644 --- a/drivers/clocksource/mtk_timer.c +++ b/drivers/clocksource/mtk_timer.c @@ -265,4 +265,4 @@ static int __init mtk_timer_init(struct device_node *node) return -EINVAL; } -CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); +TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index 99b77af..a03434e 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -293,4 +293,4 @@ static int __init mxs_timer_init(struct device_node *np) return setup_irq(irq, &mxs_timer_irq); } -CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init); +TIMER_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init); diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 7d44de3..8e4ddb9 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -284,5 +284,5 @@ static int __init nmdk_timer_of_init(struct device_node *node) return nmdk_timer_init(base, irq, pclk, clk); } -CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu", +TIMER_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu", nmdk_timer_of_init); diff --git a/drivers/clocksource/pxa_timer.c b/drivers/clocksource/pxa_timer.c index a10fa667..08cd6eaf 100644 --- a/drivers/clocksource/pxa_timer.c +++ b/drivers/clocksource/pxa_timer.c @@ -216,7 +216,7 @@ static int __init pxa_timer_dt_init(struct device_node *np) return pxa_timer_common_init(irq, clk_get_rate(clk)); } -CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init); +TIMER_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init); /* * Legacy timer init for non device-tree boards. diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c index ee358cd..89816f8 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -254,5 +254,5 @@ static int __init msm_dt_timer_init(struct device_node *np) return msm_timer_init(freq, 32, irq, !!percpu_offset); } -CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); -CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); +TIMER_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); +TIMER_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); diff --git a/drivers/clocksource/renesas-ostm.c b/drivers/clocksource/renesas-ostm.c index c76f576..6cffd7c 100644 --- a/drivers/clocksource/renesas-ostm.c +++ b/drivers/clocksource/renesas-ostm.c @@ -262,4 +262,4 @@ static int __init ostm_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(ostm, "renesas,ostm", ostm_init); +TIMER_OF_DECLARE(ostm, "renesas,ostm", ostm_init); diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index 49c02be..c27f4c8 100644 --- a/drivers/clocksource/rockchip_timer.c +++ b/drivers/clocksource/rockchip_timer.c @@ -303,5 +303,5 @@ static int __init rk_timer_init(struct device_node *np) return -EINVAL; } -CLOCKSOURCE_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer", rk_timer_init); -CLOCKSOURCE_OF_DECLARE(rk3399_timer, "rockchip,rk3399-timer", rk_timer_init); +TIMER_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer", rk_timer_init); +TIMER_OF_DECLARE(rk3399_timer, "rockchip,rk3399-timer", rk_timer_init); diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index a68e653..21cd72c 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -466,7 +466,7 @@ static int __init s3c2410_pwm_clocksource_init(struct device_node *np) { return samsung_pwm_alloc(np, &s3c24xx_variant); } -CLOCKSOURCE_OF_DECLARE(s3c2410_pwm, "samsung,s3c2410-pwm", s3c2410_pwm_clocksource_init); +TIMER_OF_DECLARE(s3c2410_pwm, "samsung,s3c2410-pwm", s3c2410_pwm_clocksource_init); static const struct samsung_pwm_variant s3c64xx_variant = { .bits = 32, @@ -479,7 +479,7 @@ static int __init s3c64xx_pwm_clocksource_init(struct device_node *np) { return samsung_pwm_alloc(np, &s3c64xx_variant); } -CLOCKSOURCE_OF_DECLARE(s3c6400_pwm, "samsung,s3c6400-pwm", s3c64xx_pwm_clocksource_init); +TIMER_OF_DECLARE(s3c6400_pwm, "samsung,s3c6400-pwm", s3c64xx_pwm_clocksource_init); static const struct samsung_pwm_variant s5p64x0_variant = { .bits = 32, @@ -492,7 +492,7 @@ static int __init s5p64x0_pwm_clocksource_init(struct device_node *np) { return samsung_pwm_alloc(np, &s5p64x0_variant); } -CLOCKSOURCE_OF_DECLARE(s5p6440_pwm, "samsung,s5p6440-pwm", s5p64x0_pwm_clocksource_init); +TIMER_OF_DECLARE(s5p6440_pwm, "samsung,s5p6440-pwm", s5p64x0_pwm_clocksource_init); static const struct samsung_pwm_variant s5p_variant = { .bits = 32, @@ -505,5 +505,5 @@ static int __init s5p_pwm_clocksource_init(struct device_node *np) { return samsung_pwm_alloc(np, &s5p_variant); } -CLOCKSOURCE_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); +TIMER_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); #endif diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index 4452d5c..3e4bc64 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -233,5 +233,5 @@ static int __init sun4i_timer_init(struct device_node *node) return ret; } -CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", +TIMER_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", sun4i_timer_init); diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c index 12fcef8..c4e1c2e 100644 --- a/drivers/clocksource/tango_xtal.c +++ b/drivers/clocksource/tango_xtal.c @@ -53,4 +53,4 @@ static int __init tango_clocksource_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); +TIMER_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c index b9990b9..c337a81 100644 --- a/drivers/clocksource/tegra20_timer.c +++ b/drivers/clocksource/tegra20_timer.c @@ -237,7 +237,7 @@ static int __init tegra20_init_timer(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer); +TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer); static int __init tegra20_init_rtc(struct device_node *np) { @@ -261,4 +261,4 @@ static int __init tegra20_init_rtc(struct device_node *np) return register_persistent_clock(NULL, tegra_read_persistent_clock64); } -CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc); +TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc); diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index aea4380..edf1a46 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -351,7 +351,7 @@ static int __init armada_xp_timer_init(struct device_node *np) return armada_370_xp_timer_common_init(np); } -CLOCKSOURCE_OF_DECLARE(armada_xp, "marvell,armada-xp-timer", +TIMER_OF_DECLARE(armada_xp, "marvell,armada-xp-timer", armada_xp_timer_init); static int __init armada_375_timer_init(struct device_node *np) @@ -389,7 +389,7 @@ static int __init armada_375_timer_init(struct device_node *np) return armada_370_xp_timer_common_init(np); } -CLOCKSOURCE_OF_DECLARE(armada_375, "marvell,armada-375-timer", +TIMER_OF_DECLARE(armada_375, "marvell,armada-375-timer", armada_375_timer_init); static int __init armada_370_timer_init(struct device_node *np) @@ -412,5 +412,5 @@ static int __init armada_370_timer_init(struct device_node *np) return armada_370_xp_timer_common_init(np); } -CLOCKSOURCE_OF_DECLARE(armada_370, "marvell,armada-370-timer", +TIMER_OF_DECLARE(armada_370, "marvell,armada-370-timer", armada_370_timer_init); diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c index ce0f97b..257e810 100644 --- a/drivers/clocksource/time-efm32.c +++ b/drivers/clocksource/time-efm32.c @@ -283,5 +283,5 @@ static int __init efm32_timer_init(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init); -CLOCKSOURCE_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init); +TIMER_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init); +TIMER_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init); diff --git a/drivers/clocksource/time-lpc32xx.c b/drivers/clocksource/time-lpc32xx.c index 9649cfd..d51a62a 100644 --- a/drivers/clocksource/time-lpc32xx.c +++ b/drivers/clocksource/time-lpc32xx.c @@ -311,4 +311,4 @@ static int __init lpc32xx_timer_init(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(lpc32xx_timer, "nxp,lpc3220-timer", lpc32xx_timer_init); +TIMER_OF_DECLARE(lpc32xx_timer, "nxp,lpc3220-timer", lpc32xx_timer_init); diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c index b9b97f6..1220206 100644 --- a/drivers/clocksource/time-orion.c +++ b/drivers/clocksource/time-orion.c @@ -189,4 +189,4 @@ static int __init orion_timer_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(orion_timer, "marvell,orion-timer", orion_timer_init); +TIMER_OF_DECLARE(orion_timer, "marvell,orion-timer", orion_timer_init); diff --git a/drivers/clocksource/time-pistachio.c b/drivers/clocksource/time-pistachio.c index 3710e4d..a2dd85d 100644 --- a/drivers/clocksource/time-pistachio.c +++ b/drivers/clocksource/time-pistachio.c @@ -214,5 +214,5 @@ static int __init pistachio_clksrc_of_init(struct device_node *node) sched_clock_register(pistachio_read_sched_clock, 32, rate); return clocksource_register_hz(&pcs_gpt.cs, rate); } -CLOCKSOURCE_OF_DECLARE(pistachio_gptimer, "img,pistachio-gptimer", +TIMER_OF_DECLARE(pistachio_gptimer, "img,pistachio-gptimer", pistachio_clksrc_of_init); diff --git a/drivers/clocksource/timer-atlas7.c b/drivers/clocksource/timer-atlas7.c index 50300ee..62c4bbc 100644 --- a/drivers/clocksource/timer-atlas7.c +++ b/drivers/clocksource/timer-atlas7.c @@ -283,4 +283,4 @@ static int __init sirfsoc_of_timer_init(struct device_node *np) return sirfsoc_atlas7_timer_init(np); } -CLOCKSOURCE_OF_DECLARE(sirfsoc_atlas7_timer, "sirf,atlas7-tick", sirfsoc_of_timer_init); +TIMER_OF_DECLARE(sirfsoc_atlas7_timer, "sirf,atlas7-tick", sirfsoc_of_timer_init); diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index cc11235..ec8a437 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -255,5 +255,5 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", +TIMER_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", at91sam926x_pit_dt_init); diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c index be4ac76..d2e660f 100644 --- a/drivers/clocksource/timer-atmel-st.c +++ b/drivers/clocksource/timer-atmel-st.c @@ -260,5 +260,5 @@ static int __init atmel_st_timer_init(struct device_node *node) /* register clocksource */ return clocksource_register_hz(&clk32k, sclk_rate); } -CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", +TIMER_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", atmel_st_timer_init); diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c index 94a161e..1e984a4 100644 --- a/drivers/clocksource/timer-digicolor.c +++ b/drivers/clocksource/timer-digicolor.c @@ -203,5 +203,5 @@ static int __init digicolor_timer_init(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(conexant_digicolor, "cnxt,cx92755-timer", +TIMER_OF_DECLARE(conexant_digicolor, "cnxt,cx92755-timer", digicolor_timer_init); diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c index d96190e..a21020c 100644 --- a/drivers/clocksource/timer-fttmr010.c +++ b/drivers/clocksource/timer-fttmr010.c @@ -364,8 +364,8 @@ static __init int fttmr010_timer_init(struct device_node *np) return fttmr010_common_init(np, false); } -CLOCKSOURCE_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init); -CLOCKSOURCE_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init); -CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init); -CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", aspeed_timer_init); -CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", aspeed_timer_init); +TIMER_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init); +TIMER_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init); +TIMER_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init); +TIMER_OF_DECLARE(ast2400, "aspeed,ast2400-timer", aspeed_timer_init); +TIMER_OF_DECLARE(ast2500, "aspeed,ast2500-timer", aspeed_timer_init); diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index f595460..6ec6d79 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -545,15 +545,15 @@ static int __init imx6dl_timer_init_dt(struct device_node *np) return mxc_timer_init_dt(np, GPT_TYPE_IMX6DL); } -CLOCKSOURCE_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx51_timer, "fsl,imx51-gpt", imx31_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx53_timer, "fsl,imx53-gpt", imx31_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx6q_timer, "fsl,imx6q-gpt", imx31_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx6dl_timer, "fsl,imx6dl-gpt", imx6dl_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx6sl_timer, "fsl,imx6sl-gpt", imx6dl_timer_init_dt); -CLOCKSOURCE_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt); +TIMER_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt); +TIMER_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt); +TIMER_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt); +TIMER_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt); +TIMER_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt); +TIMER_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt); +TIMER_OF_DECLARE(imx51_timer, "fsl,imx51-gpt", imx31_timer_init_dt); +TIMER_OF_DECLARE(imx53_timer, "fsl,imx53-gpt", imx31_timer_init_dt); +TIMER_OF_DECLARE(imx6q_timer, "fsl,imx6q-gpt", imx31_timer_init_dt); +TIMER_OF_DECLARE(imx6dl_timer, "fsl,imx6dl-gpt", imx6dl_timer_init_dt); +TIMER_OF_DECLARE(imx6sl_timer, "fsl,imx6sl-gpt", imx6dl_timer_init_dt); +TIMER_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt); diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c index 04ad306..2ff64d9 100644 --- a/drivers/clocksource/timer-integrator-ap.c +++ b/drivers/clocksource/timer-integrator-ap.c @@ -232,5 +232,5 @@ static int __init integrator_ap_timer_init_of(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(integrator_ap_timer, "arm,integrator-timer", +TIMER_OF_DECLARE(integrator_ap_timer, "arm,integrator-timer", integrator_ap_timer_init_of); diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c index ab68a47..0eee032 100644 --- a/drivers/clocksource/timer-keystone.c +++ b/drivers/clocksource/timer-keystone.c @@ -226,5 +226,5 @@ static int __init keystone_timer_init(struct device_node *np) return error; } -CLOCKSOURCE_OF_DECLARE(keystone_timer, "ti,keystone-timer", +TIMER_OF_DECLARE(keystone_timer, "ti,keystone-timer", keystone_timer_init); diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c index e74ea17..7b6bb0d 100644 --- a/drivers/clocksource/timer-nps.c +++ b/drivers/clocksource/timer-nps.c @@ -110,9 +110,9 @@ static int __init nps_setup_clocksource(struct device_node *node) return ret; } -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer", +TIMER_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer", nps_setup_clocksource); -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clk_src, "ezchip,nps400-timer1", +TIMER_OF_DECLARE(ezchip_nps400_clk_src, "ezchip,nps400-timer1", nps_setup_clocksource); #ifdef CONFIG_EZNPS_MTM_EXT @@ -279,6 +279,6 @@ static int __init nps_setup_clockevent(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clk_evt, "ezchip,nps400-timer0", +TIMER_OF_DECLARE(ezchip_nps400_clk_evt, "ezchip,nps400-timer0", nps_setup_clockevent); #endif /* CONFIG_EZNPS_MTM_EXT */ diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c index d630bf4..eed6fef 100644 --- a/drivers/clocksource/timer-oxnas-rps.c +++ b/drivers/clocksource/timer-oxnas-rps.c @@ -293,7 +293,7 @@ static int __init oxnas_rps_timer_init(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(ox810se_rps, +TIMER_OF_DECLARE(ox810se_rps, "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); -CLOCKSOURCE_OF_DECLARE(ox820_rps, +TIMER_OF_DECLARE(ox820_rps, "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init); diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c index b4122ed..20ff33b 100644 --- a/drivers/clocksource/timer-prima2.c +++ b/drivers/clocksource/timer-prima2.c @@ -245,5 +245,5 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(sirfsoc_prima2_timer, +TIMER_OF_DECLARE(sirfsoc_prima2_timer, "sirf,prima2-tick", sirfsoc_prima2_timer_init); diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index 2d575a8c..3ac9dec 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -287,7 +287,7 @@ static int __init sp804_of_init(struct device_node *np) iounmap(base); return ret; } -CLOCKSOURCE_OF_DECLARE(sp804, "arm,sp804", sp804_of_init); +TIMER_OF_DECLARE(sp804, "arm,sp804", sp804_of_init); static int __init integrator_cp_of_init(struct device_node *np) { @@ -335,4 +335,4 @@ static int __init integrator_cp_of_init(struct device_node *np) iounmap(base); return ret; } -CLOCKSOURCE_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init); +TIMER_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init); diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index 1b2574c..174d1243 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -187,4 +187,4 @@ static int __init stm32_clockevent_init(struct device_node *np) return ret; } -CLOCKSOURCE_OF_DECLARE(stm32, "st,stm32-timer", stm32_clockevent_init); +TIMER_OF_DECLARE(stm32, "st,stm32-timer", stm32_clockevent_init); diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 2e9c830..a4ebc8f 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -358,7 +358,7 @@ static int __init sun5i_timer_init(struct device_node *node) return sun5i_setup_clockevent(node, timer_base, clk, irq); } -CLOCKSOURCE_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer", +TIMER_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer", sun5i_timer_init); -CLOCKSOURCE_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer", +TIMER_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer", sun5i_timer_init); diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c index 6240677..880a861 100644 --- a/drivers/clocksource/timer-ti-32k.c +++ b/drivers/clocksource/timer-ti-32k.c @@ -124,5 +124,5 @@ static int __init ti_32k_timer_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(ti_32k_timer, "ti,omap-counter32k", +TIMER_OF_DECLARE(ti_32k_timer, "ti,omap-counter32k", ti_32k_timer_init); diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c index 704e40c..be34b11 100644 --- a/drivers/clocksource/timer-u300.c +++ b/drivers/clocksource/timer-u300.c @@ -458,5 +458,5 @@ static int __init u300_timer_init_of(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(u300_timer, "stericsson,u300-apptimer", +TIMER_OF_DECLARE(u300_timer, "stericsson,u300-apptimer", u300_timer_init_of); diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c index 220b490..39725d3 100644 --- a/drivers/clocksource/versatile.c +++ b/drivers/clocksource/versatile.c @@ -38,7 +38,7 @@ static int __init versatile_sched_clock_init(struct device_node *node) return 0; } -CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg", +TIMER_OF_DECLARE(vexpress, "arm,vexpress-sysreg", versatile_sched_clock_init); -CLOCKSOURCE_OF_DECLARE(versatile, "arm,versatile-sysreg", +TIMER_OF_DECLARE(versatile, "arm,versatile-sysreg", versatile_sched_clock_init); diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c index e0849e2..0f92089 100644 --- a/drivers/clocksource/vf_pit_timer.c +++ b/drivers/clocksource/vf_pit_timer.c @@ -201,4 +201,4 @@ static int __init pit_timer_init(struct device_node *np) return pit_clockevent_init(clk_rate, irq); } -CLOCKSOURCE_OF_DECLARE(vf610, "fsl,vf610-pit", pit_timer_init); +TIMER_OF_DECLARE(vf610, "fsl,vf610-pit", pit_timer_init); diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c index d02b510..e0f7489 100644 --- a/drivers/clocksource/vt8500_timer.c +++ b/drivers/clocksource/vt8500_timer.c @@ -165,4 +165,4 @@ static int __init vt8500_timer_init(struct device_node *np) return 0; } -CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init); +TIMER_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init); diff --git a/drivers/clocksource/zevio-timer.c b/drivers/clocksource/zevio-timer.c index 9a53f5e..a6a0338 100644 --- a/drivers/clocksource/zevio-timer.c +++ b/drivers/clocksource/zevio-timer.c @@ -215,4 +215,4 @@ static int __init zevio_timer_init(struct device_node *node) return zevio_timer_add(node); } -CLOCKSOURCE_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_init); +TIMER_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_init); diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index f2b10d9..a86b65f 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -249,7 +249,7 @@ extern int clocksource_mmio_init(void __iomem *, const char *, extern int clocksource_i8253_init(void); -#define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ +#define TIMER_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1_RET(clksrc, name, compat, fn) #ifdef CONFIG_CLKSRC_PROBE -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano @ 2017-05-28 13:48 ` Linus Walleij 2017-05-28 14:20 ` Daniel Lezcano 2017-05-29 7:39 ` Heiko Stübner ` (5 subsequent siblings) 6 siblings, 1 reply; 19+ messages in thread From: Linus Walleij @ 2017-05-28 13:48 UTC (permalink / raw) To: Daniel Lezcano Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan, ARM/Rockchip On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where splitting > a clocksource/clockevent definition does not make sense as it is a Linux > concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>' This makes the macro make sense and I had this idea one time too. Awesome. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij > --- > arch/arm/kernel/smp_twd.c | 6 +++--- > arch/microblaze/kernel/timer.c | 2 +- > arch/mips/ralink/cevt-rt3352.c | 2 +- > arch/nios2/kernel/time.c | 2 +- > drivers/clocksource/arc_timer.c | 6 +++--- > drivers/clocksource/arm_arch_timer.c | 6 +++--- > drivers/clocksource/arm_global_timer.c | 2 +- > drivers/clocksource/armv7m_systick.c | 2 +- > drivers/clocksource/asm9260_timer.c | 2 +- > drivers/clocksource/bcm2835_timer.c | 2 +- > drivers/clocksource/bcm_kona_timer.c | 4 ++-- > drivers/clocksource/cadence_ttc_timer.c | 2 +- > drivers/clocksource/clksrc-dbx500-prcmu.c | 2 +- > drivers/clocksource/clksrc_st_lpc.c | 2 +- > drivers/clocksource/clps711x-timer.c | 2 +- > drivers/clocksource/dw_apb_timer_of.c | 8 ++++---- > drivers/clocksource/exynos_mct.c | 4 ++-- > drivers/clocksource/fsl_ftm_timer.c | 2 +- > drivers/clocksource/h8300_timer16.c | 2 +- > drivers/clocksource/h8300_timer8.c | 2 +- > drivers/clocksource/h8300_tpu.c | 2 +- > drivers/clocksource/jcore-pit.c | 2 +- > drivers/clocksource/meson6_timer.c | 2 +- > drivers/clocksource/mips-gic-timer.c | 2 +- > drivers/clocksource/mps2-timer.c | 2 +- > drivers/clocksource/mtk_timer.c | 2 +- > drivers/clocksource/mxs_timer.c | 2 +- > drivers/clocksource/nomadik-mtu.c | 2 +- > drivers/clocksource/pxa_timer.c | 2 +- > drivers/clocksource/qcom-timer.c | 4 ++-- > drivers/clocksource/renesas-ostm.c | 2 +- > drivers/clocksource/rockchip_timer.c | 4 ++-- > drivers/clocksource/samsung_pwm_timer.c | 8 ++++---- > drivers/clocksource/sun4i_timer.c | 2 +- > drivers/clocksource/tango_xtal.c | 2 +- > drivers/clocksource/tegra20_timer.c | 4 ++-- > drivers/clocksource/time-armada-370-xp.c | 6 +++--- > drivers/clocksource/time-efm32.c | 4 ++-- > drivers/clocksource/time-lpc32xx.c | 2 +- > drivers/clocksource/time-orion.c | 2 +- > drivers/clocksource/time-pistachio.c | 2 +- > drivers/clocksource/timer-atlas7.c | 2 +- > drivers/clocksource/timer-atmel-pit.c | 2 +- > drivers/clocksource/timer-atmel-st.c | 2 +- > drivers/clocksource/timer-digicolor.c | 2 +- > drivers/clocksource/timer-fttmr010.c | 10 +++++----- > drivers/clocksource/timer-imx-gpt.c | 24 ++++++++++++------------ > drivers/clocksource/timer-integrator-ap.c | 2 +- > drivers/clocksource/timer-keystone.c | 2 +- > drivers/clocksource/timer-nps.c | 6 +++--- > drivers/clocksource/timer-oxnas-rps.c | 4 ++-- > drivers/clocksource/timer-prima2.c | 2 +- > drivers/clocksource/timer-sp804.c | 4 ++-- > drivers/clocksource/timer-stm32.c | 2 +- > drivers/clocksource/timer-sun5i.c | 4 ++-- > drivers/clocksource/timer-ti-32k.c | 2 +- > drivers/clocksource/timer-u300.c | 2 +- > drivers/clocksource/versatile.c | 4 ++-- > drivers/clocksource/vf_pit_timer.c | 2 +- > drivers/clocksource/vt8500_timer.c | 2 +- > drivers/clocksource/zevio-timer.c | 2 +- > include/linux/clocksource.h | 2 +- > 62 files changed, 103 insertions(+), 103 deletions(-) > > diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c > index 895ae51..b30eafe 100644 > --- a/arch/arm/kernel/smp_twd.c > +++ b/arch/arm/kernel/smp_twd.c > @@ -403,7 +403,7 @@ static int __init twd_local_timer_of_register(struct device_node *np) > WARN(err, "twd_local_timer_of_register failed (%d)\n", err); > return err; > } > -CLOCKSOURCE_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); > -CLOCKSOURCE_OF_DECLARE(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); > -CLOCKSOURCE_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); > +TIMER_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); > +TIMER_OF_DECLARE(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); > +TIMER_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); > #endif > diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c > index 9990661..873a1cc 100644 > --- a/arch/microblaze/kernel/timer.c > +++ b/arch/microblaze/kernel/timer.c > @@ -333,5 +333,5 @@ static int __init xilinx_timer_init(struct device_node *timer) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a", > +TIMER_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a", > xilinx_timer_init); > diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c > index b8a1376..92f284d 100644 > --- a/arch/mips/ralink/cevt-rt3352.c > +++ b/arch/mips/ralink/cevt-rt3352.c > @@ -152,4 +152,4 @@ static int __init ralink_systick_init(struct device_node *np) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); > +TIMER_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); > diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c > index 6e2bdc9..2954b66 100644 > --- a/arch/nios2/kernel/time.c > +++ b/arch/nios2/kernel/time.c > @@ -353,4 +353,4 @@ void __init time_init(void) > clocksource_probe(); > } > > -CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); > +TIMER_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); > diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c > index 2164973..4927355 100644 > --- a/drivers/clocksource/arc_timer.c > +++ b/drivers/clocksource/arc_timer.c > @@ -99,7 +99,7 @@ static int __init arc_cs_setup_gfrc(struct device_node *node) > > return clocksource_register_hz(&arc_counter_gfrc, arc_timer_freq); > } > -CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); > +TIMER_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); > > #define AUX_RTC_CTRL 0x103 > #define AUX_RTC_LOW 0x104 > @@ -158,7 +158,7 @@ static int __init arc_cs_setup_rtc(struct device_node *node) > > return clocksource_register_hz(&arc_counter_rtc, arc_timer_freq); > } > -CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); > +TIMER_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); > > #endif > > @@ -333,4 +333,4 @@ static int __init arc_of_timer_init(struct device_node *np) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init); > +TIMER_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init); > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index a1fb918..9a41958 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -1194,8 +1194,8 @@ static int __init arch_timer_of_init(struct device_node *np) > > return arch_timer_common_init(); > } > -CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init); > -CLOCKSOURCE_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init); > +TIMER_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init); > +TIMER_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init); > > static u32 __init > arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame) > @@ -1382,7 +1382,7 @@ static int __init arch_timer_mem_of_init(struct device_node *np) > kfree(timer_mem); > return ret; > } > -CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", > +TIMER_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", > arch_timer_mem_of_init); > > #ifdef CONFIG_ACPI_GTDT > diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c > index 123ed20..095bb96 100644 > --- a/drivers/clocksource/arm_global_timer.c > +++ b/drivers/clocksource/arm_global_timer.c > @@ -339,5 +339,5 @@ static int __init global_timer_of_register(struct device_node *np) > } > > /* Only tested on r2p2 and r3p0 */ > -CLOCKSOURCE_OF_DECLARE(arm_gt, "arm,cortex-a9-global-timer", > +TIMER_OF_DECLARE(arm_gt, "arm,cortex-a9-global-timer", > global_timer_of_register); > diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c > index a315491..ac046d6 100644 > --- a/drivers/clocksource/armv7m_systick.c > +++ b/drivers/clocksource/armv7m_systick.c > @@ -82,5 +82,5 @@ static int __init system_timer_of_register(struct device_node *np) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(arm_systick, "arm,armv7m-systick", > +TIMER_OF_DECLARE(arm_systick, "arm,armv7m-systick", > system_timer_of_register); > diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c > index c678083..38cd2fe 100644 > --- a/drivers/clocksource/asm9260_timer.c > +++ b/drivers/clocksource/asm9260_timer.c > @@ -238,5 +238,5 @@ static int __init asm9260_timer_init(struct device_node *np) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(asm9260_timer, "alphascale,asm9260-timer", > +TIMER_OF_DECLARE(asm9260_timer, "alphascale,asm9260-timer", > asm9260_timer_init); > diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c > index dce4430..82828d3 100644 > --- a/drivers/clocksource/bcm2835_timer.c > +++ b/drivers/clocksource/bcm2835_timer.c > @@ -148,5 +148,5 @@ static int __init bcm2835_timer_init(struct device_node *node) > iounmap(base); > return ret; > } > -CLOCKSOURCE_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer", > +TIMER_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer", > bcm2835_timer_init); > diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c > index fda5e147..5c40be9 100644 > --- a/drivers/clocksource/bcm_kona_timer.c > +++ b/drivers/clocksource/bcm_kona_timer.c > @@ -198,9 +198,9 @@ static int __init kona_timer_init(struct device_node *node) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(brcm_kona, "brcm,kona-timer", kona_timer_init); > +TIMER_OF_DECLARE(brcm_kona, "brcm,kona-timer", kona_timer_init); > /* > * bcm,kona-timer is deprecated by brcm,kona-timer > * being kept here for driver compatibility > */ > -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init); > +TIMER_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init); > diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c > index 44e5e95..a144dfc 100644 > --- a/drivers/clocksource/cadence_ttc_timer.c > +++ b/drivers/clocksource/cadence_ttc_timer.c > @@ -539,4 +539,4 @@ static int __init ttc_timer_init(struct device_node *timer) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(ttc, "cdns,ttc", ttc_timer_init); > +TIMER_OF_DECLARE(ttc, "cdns,ttc", ttc_timer_init); > diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c > index c69e277..c1b96dc 100644 > --- a/drivers/clocksource/clksrc-dbx500-prcmu.c > +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c > @@ -86,5 +86,5 @@ static int __init clksrc_dbx500_prcmu_init(struct device_node *node) > #endif > return clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); > } > -CLOCKSOURCE_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", > +TIMER_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", > clksrc_dbx500_prcmu_init); > diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c > index 03cc492..a1d01eb 100644 > --- a/drivers/clocksource/clksrc_st_lpc.c > +++ b/drivers/clocksource/clksrc_st_lpc.c > @@ -132,4 +132,4 @@ static int __init st_clksrc_of_register(struct device_node *np) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > +TIMER_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c > index 24db6d6..fc9e025 100644 > --- a/drivers/clocksource/clps711x-timer.c > +++ b/drivers/clocksource/clps711x-timer.c > @@ -119,5 +119,5 @@ static int __init clps711x_timer_init(struct device_node *np) > return -EINVAL; > } > } > -CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init); > +TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init); > #endif > diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c > index aee6c0d..69866cd 100644 > --- a/drivers/clocksource/dw_apb_timer_of.c > +++ b/drivers/clocksource/dw_apb_timer_of.c > @@ -167,7 +167,7 @@ static int __init dw_apb_timer_init(struct device_node *timer) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); > -CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); > -CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); > -CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init); > +TIMER_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); > +TIMER_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); > +TIMER_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); > +TIMER_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init); > diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c > index 670ff0f..7a244b6 100644 > --- a/drivers/clocksource/exynos_mct.c > +++ b/drivers/clocksource/exynos_mct.c > @@ -610,5 +610,5 @@ static int __init mct_init_ppi(struct device_node *np) > { > return mct_init_dt(np, MCT_INT_PPI); > } > -CLOCKSOURCE_OF_DECLARE(exynos4210, "samsung,exynos4210-mct", mct_init_spi); > -CLOCKSOURCE_OF_DECLARE(exynos4412, "samsung,exynos4412-mct", mct_init_ppi); > +TIMER_OF_DECLARE(exynos4210, "samsung,exynos4210-mct", mct_init_spi); > +TIMER_OF_DECLARE(exynos4412, "samsung,exynos4412-mct", mct_init_ppi); > diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c > index 738515b..3121e2d 100644 > --- a/drivers/clocksource/fsl_ftm_timer.c > +++ b/drivers/clocksource/fsl_ftm_timer.c > @@ -369,4 +369,4 @@ static int __init ftm_timer_init(struct device_node *np) > kfree(priv); > return ret; > } > -CLOCKSOURCE_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init); > +TIMER_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init); > diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c > index 5b27fb9..dfbd4f8 100644 > --- a/drivers/clocksource/h8300_timer16.c > +++ b/drivers/clocksource/h8300_timer16.c > @@ -187,5 +187,5 @@ static int __init h8300_16timer_init(struct device_node *node) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(h8300_16bit, "renesas,16bit-timer", > +TIMER_OF_DECLARE(h8300_16bit, "renesas,16bit-timer", > h8300_16timer_init); > diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c > index 804c489..f6ffb0c 100644 > --- a/drivers/clocksource/h8300_timer8.c > +++ b/drivers/clocksource/h8300_timer8.c > @@ -207,4 +207,4 @@ static int __init h8300_8timer_init(struct device_node *node) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init); > +TIMER_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init); > diff --git a/drivers/clocksource/h8300_tpu.c b/drivers/clocksource/h8300_tpu.c > index 72e1cf2..45a8d17 100644 > --- a/drivers/clocksource/h8300_tpu.c > +++ b/drivers/clocksource/h8300_tpu.c > @@ -154,4 +154,4 @@ static int __init h8300_tpu_init(struct device_node *node) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(h8300_tpu, "renesas,tpu", h8300_tpu_init); > +TIMER_OF_DECLARE(h8300_tpu, "renesas,tpu", h8300_tpu_init); > diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c > index 7c61226..5d3d88e0f 100644 > --- a/drivers/clocksource/jcore-pit.c > +++ b/drivers/clocksource/jcore-pit.c > @@ -246,4 +246,4 @@ static int __init jcore_pit_init(struct device_node *node) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init); > +TIMER_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init); > diff --git a/drivers/clocksource/meson6_timer.c b/drivers/clocksource/meson6_timer.c > index 39d21f6..92f2099 100644 > --- a/drivers/clocksource/meson6_timer.c > +++ b/drivers/clocksource/meson6_timer.c > @@ -174,5 +174,5 @@ static int __init meson6_timer_init(struct device_node *node) > 1, 0xfffe); > return 0; > } > -CLOCKSOURCE_OF_DECLARE(meson6, "amlogic,meson6-timer", > +TIMER_OF_DECLARE(meson6, "amlogic,meson6-timer", > meson6_timer_init); > diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c > index 3f52ee2..e31e083 100644 > --- a/drivers/clocksource/mips-gic-timer.c > +++ b/drivers/clocksource/mips-gic-timer.c > @@ -200,5 +200,5 @@ static int __init gic_clocksource_of_init(struct device_node *node) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer", > +TIMER_OF_DECLARE(mips_gic_timer, "mti,gic-timer", > gic_clocksource_of_init); > diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c > index 3e4431e..aa4d63af 100644 > --- a/drivers/clocksource/mps2-timer.c > +++ b/drivers/clocksource/mps2-timer.c > @@ -274,4 +274,4 @@ static int __init mps2_timer_init(struct device_node *np) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); > +TIMER_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); > diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c > index 9065949..f9b724f 100644 > --- a/drivers/clocksource/mtk_timer.c > +++ b/drivers/clocksource/mtk_timer.c > @@ -265,4 +265,4 @@ static int __init mtk_timer_init(struct device_node *node) > > return -EINVAL; > } > -CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); > +TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); > diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c > index 99b77af..a03434e 100644 > --- a/drivers/clocksource/mxs_timer.c > +++ b/drivers/clocksource/mxs_timer.c > @@ -293,4 +293,4 @@ static int __init mxs_timer_init(struct device_node *np) > > return setup_irq(irq, &mxs_timer_irq); > } > -CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init); > +TIMER_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init); > diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c > index 7d44de3..8e4ddb9 100644 > --- a/drivers/clocksource/nomadik-mtu.c > +++ b/drivers/clocksource/nomadik-mtu.c > @@ -284,5 +284,5 @@ static int __init nmdk_timer_of_init(struct device_node *node) > > return nmdk_timer_init(base, irq, pclk, clk); > } > -CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu", > +TIMER_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu", > nmdk_timer_of_init); > diff --git a/drivers/clocksource/pxa_timer.c b/drivers/clocksource/pxa_timer.c > index a10fa667..08cd6eaf 100644 > --- a/drivers/clocksource/pxa_timer.c > +++ b/drivers/clocksource/pxa_timer.c > @@ -216,7 +216,7 @@ static int __init pxa_timer_dt_init(struct device_node *np) > > return pxa_timer_common_init(irq, clk_get_rate(clk)); > } > -CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init); > +TIMER_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init); > > /* > * Legacy timer init for non device-tree boards. > diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c > index ee358cd..89816f8 100644 > --- a/drivers/clocksource/qcom-timer.c > +++ b/drivers/clocksource/qcom-timer.c > @@ -254,5 +254,5 @@ static int __init msm_dt_timer_init(struct device_node *np) > > return msm_timer_init(freq, 32, irq, !!percpu_offset); > } > -CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); > -CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); > +TIMER_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); > +TIMER_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); > diff --git a/drivers/clocksource/renesas-ostm.c b/drivers/clocksource/renesas-ostm.c > index c76f576..6cffd7c 100644 > --- a/drivers/clocksource/renesas-ostm.c > +++ b/drivers/clocksource/renesas-ostm.c > @@ -262,4 +262,4 @@ static int __init ostm_init(struct device_node *np) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(ostm, "renesas,ostm", ostm_init); > +TIMER_OF_DECLARE(ostm, "renesas,ostm", ostm_init); > diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c > index 49c02be..c27f4c8 100644 > --- a/drivers/clocksource/rockchip_timer.c > +++ b/drivers/clocksource/rockchip_timer.c > @@ -303,5 +303,5 @@ static int __init rk_timer_init(struct device_node *np) > return -EINVAL; > } > > -CLOCKSOURCE_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer", rk_timer_init); > -CLOCKSOURCE_OF_DECLARE(rk3399_timer, "rockchip,rk3399-timer", rk_timer_init); > +TIMER_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer", rk_timer_init); > +TIMER_OF_DECLARE(rk3399_timer, "rockchip,rk3399-timer", rk_timer_init); > diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c > index a68e653..21cd72c 100644 > --- a/drivers/clocksource/samsung_pwm_timer.c > +++ b/drivers/clocksource/samsung_pwm_timer.c > @@ -466,7 +466,7 @@ static int __init s3c2410_pwm_clocksource_init(struct device_node *np) > { > return samsung_pwm_alloc(np, &s3c24xx_variant); > } > -CLOCKSOURCE_OF_DECLARE(s3c2410_pwm, "samsung,s3c2410-pwm", s3c2410_pwm_clocksource_init); > +TIMER_OF_DECLARE(s3c2410_pwm, "samsung,s3c2410-pwm", s3c2410_pwm_clocksource_init); > > static const struct samsung_pwm_variant s3c64xx_variant = { > .bits = 32, > @@ -479,7 +479,7 @@ static int __init s3c64xx_pwm_clocksource_init(struct device_node *np) > { > return samsung_pwm_alloc(np, &s3c64xx_variant); > } > -CLOCKSOURCE_OF_DECLARE(s3c6400_pwm, "samsung,s3c6400-pwm", s3c64xx_pwm_clocksource_init); > +TIMER_OF_DECLARE(s3c6400_pwm, "samsung,s3c6400-pwm", s3c64xx_pwm_clocksource_init); > > static const struct samsung_pwm_variant s5p64x0_variant = { > .bits = 32, > @@ -492,7 +492,7 @@ static int __init s5p64x0_pwm_clocksource_init(struct device_node *np) > { > return samsung_pwm_alloc(np, &s5p64x0_variant); > } > -CLOCKSOURCE_OF_DECLARE(s5p6440_pwm, "samsung,s5p6440-pwm", s5p64x0_pwm_clocksource_init); > +TIMER_OF_DECLARE(s5p6440_pwm, "samsung,s5p6440-pwm", s5p64x0_pwm_clocksource_init); > > static const struct samsung_pwm_variant s5p_variant = { > .bits = 32, > @@ -505,5 +505,5 @@ static int __init s5p_pwm_clocksource_init(struct device_node *np) > { > return samsung_pwm_alloc(np, &s5p_variant); > } > -CLOCKSOURCE_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); > +TIMER_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); > #endif > diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c > index 4452d5c..3e4bc64 100644 > --- a/drivers/clocksource/sun4i_timer.c > +++ b/drivers/clocksource/sun4i_timer.c > @@ -233,5 +233,5 @@ static int __init sun4i_timer_init(struct device_node *node) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", > +TIMER_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", > sun4i_timer_init); > diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c > index 12fcef8..c4e1c2e 100644 > --- a/drivers/clocksource/tango_xtal.c > +++ b/drivers/clocksource/tango_xtal.c > @@ -53,4 +53,4 @@ static int __init tango_clocksource_init(struct device_node *np) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); > +TIMER_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); > diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c > index b9990b9..c337a81 100644 > --- a/drivers/clocksource/tegra20_timer.c > +++ b/drivers/clocksource/tegra20_timer.c > @@ -237,7 +237,7 @@ static int __init tegra20_init_timer(struct device_node *np) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer); > +TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer); > > static int __init tegra20_init_rtc(struct device_node *np) > { > @@ -261,4 +261,4 @@ static int __init tegra20_init_rtc(struct device_node *np) > > return register_persistent_clock(NULL, tegra_read_persistent_clock64); > } > -CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc); > +TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc); > diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c > index aea4380..edf1a46 100644 > --- a/drivers/clocksource/time-armada-370-xp.c > +++ b/drivers/clocksource/time-armada-370-xp.c > @@ -351,7 +351,7 @@ static int __init armada_xp_timer_init(struct device_node *np) > > return armada_370_xp_timer_common_init(np); > } > -CLOCKSOURCE_OF_DECLARE(armada_xp, "marvell,armada-xp-timer", > +TIMER_OF_DECLARE(armada_xp, "marvell,armada-xp-timer", > armada_xp_timer_init); > > static int __init armada_375_timer_init(struct device_node *np) > @@ -389,7 +389,7 @@ static int __init armada_375_timer_init(struct device_node *np) > > return armada_370_xp_timer_common_init(np); > } > -CLOCKSOURCE_OF_DECLARE(armada_375, "marvell,armada-375-timer", > +TIMER_OF_DECLARE(armada_375, "marvell,armada-375-timer", > armada_375_timer_init); > > static int __init armada_370_timer_init(struct device_node *np) > @@ -412,5 +412,5 @@ static int __init armada_370_timer_init(struct device_node *np) > > return armada_370_xp_timer_common_init(np); > } > -CLOCKSOURCE_OF_DECLARE(armada_370, "marvell,armada-370-timer", > +TIMER_OF_DECLARE(armada_370, "marvell,armada-370-timer", > armada_370_timer_init); > diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c > index ce0f97b..257e810 100644 > --- a/drivers/clocksource/time-efm32.c > +++ b/drivers/clocksource/time-efm32.c > @@ -283,5 +283,5 @@ static int __init efm32_timer_init(struct device_node *np) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init); > -CLOCKSOURCE_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init); > +TIMER_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init); > +TIMER_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init); > diff --git a/drivers/clocksource/time-lpc32xx.c b/drivers/clocksource/time-lpc32xx.c > index 9649cfd..d51a62a 100644 > --- a/drivers/clocksource/time-lpc32xx.c > +++ b/drivers/clocksource/time-lpc32xx.c > @@ -311,4 +311,4 @@ static int __init lpc32xx_timer_init(struct device_node *np) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(lpc32xx_timer, "nxp,lpc3220-timer", lpc32xx_timer_init); > +TIMER_OF_DECLARE(lpc32xx_timer, "nxp,lpc3220-timer", lpc32xx_timer_init); > diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c > index b9b97f6..1220206 100644 > --- a/drivers/clocksource/time-orion.c > +++ b/drivers/clocksource/time-orion.c > @@ -189,4 +189,4 @@ static int __init orion_timer_init(struct device_node *np) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(orion_timer, "marvell,orion-timer", orion_timer_init); > +TIMER_OF_DECLARE(orion_timer, "marvell,orion-timer", orion_timer_init); > diff --git a/drivers/clocksource/time-pistachio.c b/drivers/clocksource/time-pistachio.c > index 3710e4d..a2dd85d 100644 > --- a/drivers/clocksource/time-pistachio.c > +++ b/drivers/clocksource/time-pistachio.c > @@ -214,5 +214,5 @@ static int __init pistachio_clksrc_of_init(struct device_node *node) > sched_clock_register(pistachio_read_sched_clock, 32, rate); > return clocksource_register_hz(&pcs_gpt.cs, rate); > } > -CLOCKSOURCE_OF_DECLARE(pistachio_gptimer, "img,pistachio-gptimer", > +TIMER_OF_DECLARE(pistachio_gptimer, "img,pistachio-gptimer", > pistachio_clksrc_of_init); > diff --git a/drivers/clocksource/timer-atlas7.c b/drivers/clocksource/timer-atlas7.c > index 50300ee..62c4bbc 100644 > --- a/drivers/clocksource/timer-atlas7.c > +++ b/drivers/clocksource/timer-atlas7.c > @@ -283,4 +283,4 @@ static int __init sirfsoc_of_timer_init(struct device_node *np) > > return sirfsoc_atlas7_timer_init(np); > } > -CLOCKSOURCE_OF_DECLARE(sirfsoc_atlas7_timer, "sirf,atlas7-tick", sirfsoc_of_timer_init); > +TIMER_OF_DECLARE(sirfsoc_atlas7_timer, "sirf,atlas7-tick", sirfsoc_of_timer_init); > diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c > index cc11235..ec8a437 100644 > --- a/drivers/clocksource/timer-atmel-pit.c > +++ b/drivers/clocksource/timer-atmel-pit.c > @@ -255,5 +255,5 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", > +TIMER_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", > at91sam926x_pit_dt_init); > diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c > index be4ac76..d2e660f 100644 > --- a/drivers/clocksource/timer-atmel-st.c > +++ b/drivers/clocksource/timer-atmel-st.c > @@ -260,5 +260,5 @@ static int __init atmel_st_timer_init(struct device_node *node) > /* register clocksource */ > return clocksource_register_hz(&clk32k, sclk_rate); > } > -CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", > +TIMER_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", > atmel_st_timer_init); > diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c > index 94a161e..1e984a4 100644 > --- a/drivers/clocksource/timer-digicolor.c > +++ b/drivers/clocksource/timer-digicolor.c > @@ -203,5 +203,5 @@ static int __init digicolor_timer_init(struct device_node *node) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(conexant_digicolor, "cnxt,cx92755-timer", > +TIMER_OF_DECLARE(conexant_digicolor, "cnxt,cx92755-timer", > digicolor_timer_init); > diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c > index d96190e..a21020c 100644 > --- a/drivers/clocksource/timer-fttmr010.c > +++ b/drivers/clocksource/timer-fttmr010.c > @@ -364,8 +364,8 @@ static __init int fttmr010_timer_init(struct device_node *np) > return fttmr010_common_init(np, false); > } > > -CLOCKSOURCE_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init); > -CLOCKSOURCE_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init); > -CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init); > -CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", aspeed_timer_init); > -CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", aspeed_timer_init); > +TIMER_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init); > +TIMER_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init); > +TIMER_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init); > +TIMER_OF_DECLARE(ast2400, "aspeed,ast2400-timer", aspeed_timer_init); > +TIMER_OF_DECLARE(ast2500, "aspeed,ast2500-timer", aspeed_timer_init); > diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c > index f595460..6ec6d79 100644 > --- a/drivers/clocksource/timer-imx-gpt.c > +++ b/drivers/clocksource/timer-imx-gpt.c > @@ -545,15 +545,15 @@ static int __init imx6dl_timer_init_dt(struct device_node *np) > return mxc_timer_init_dt(np, GPT_TYPE_IMX6DL); > } > > -CLOCKSOURCE_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx51_timer, "fsl,imx51-gpt", imx31_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx53_timer, "fsl,imx53-gpt", imx31_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx6q_timer, "fsl,imx6q-gpt", imx31_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx6dl_timer, "fsl,imx6dl-gpt", imx6dl_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx6sl_timer, "fsl,imx6sl-gpt", imx6dl_timer_init_dt); > -CLOCKSOURCE_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt); > +TIMER_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt); > +TIMER_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt); > +TIMER_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt); > +TIMER_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt); > +TIMER_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt); > +TIMER_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt); > +TIMER_OF_DECLARE(imx51_timer, "fsl,imx51-gpt", imx31_timer_init_dt); > +TIMER_OF_DECLARE(imx53_timer, "fsl,imx53-gpt", imx31_timer_init_dt); > +TIMER_OF_DECLARE(imx6q_timer, "fsl,imx6q-gpt", imx31_timer_init_dt); > +TIMER_OF_DECLARE(imx6dl_timer, "fsl,imx6dl-gpt", imx6dl_timer_init_dt); > +TIMER_OF_DECLARE(imx6sl_timer, "fsl,imx6sl-gpt", imx6dl_timer_init_dt); > +TIMER_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt); > diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c > index 04ad306..2ff64d9 100644 > --- a/drivers/clocksource/timer-integrator-ap.c > +++ b/drivers/clocksource/timer-integrator-ap.c > @@ -232,5 +232,5 @@ static int __init integrator_ap_timer_init_of(struct device_node *node) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(integrator_ap_timer, "arm,integrator-timer", > +TIMER_OF_DECLARE(integrator_ap_timer, "arm,integrator-timer", > integrator_ap_timer_init_of); > diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c > index ab68a47..0eee032 100644 > --- a/drivers/clocksource/timer-keystone.c > +++ b/drivers/clocksource/timer-keystone.c > @@ -226,5 +226,5 @@ static int __init keystone_timer_init(struct device_node *np) > return error; > } > > -CLOCKSOURCE_OF_DECLARE(keystone_timer, "ti,keystone-timer", > +TIMER_OF_DECLARE(keystone_timer, "ti,keystone-timer", > keystone_timer_init); > diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c > index e74ea17..7b6bb0d 100644 > --- a/drivers/clocksource/timer-nps.c > +++ b/drivers/clocksource/timer-nps.c > @@ -110,9 +110,9 @@ static int __init nps_setup_clocksource(struct device_node *node) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer", > +TIMER_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer", > nps_setup_clocksource); > -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clk_src, "ezchip,nps400-timer1", > +TIMER_OF_DECLARE(ezchip_nps400_clk_src, "ezchip,nps400-timer1", > nps_setup_clocksource); > > #ifdef CONFIG_EZNPS_MTM_EXT > @@ -279,6 +279,6 @@ static int __init nps_setup_clockevent(struct device_node *node) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clk_evt, "ezchip,nps400-timer0", > +TIMER_OF_DECLARE(ezchip_nps400_clk_evt, "ezchip,nps400-timer0", > nps_setup_clockevent); > #endif /* CONFIG_EZNPS_MTM_EXT */ > diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c > index d630bf4..eed6fef 100644 > --- a/drivers/clocksource/timer-oxnas-rps.c > +++ b/drivers/clocksource/timer-oxnas-rps.c > @@ -293,7 +293,7 @@ static int __init oxnas_rps_timer_init(struct device_node *np) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(ox810se_rps, > +TIMER_OF_DECLARE(ox810se_rps, > "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); > -CLOCKSOURCE_OF_DECLARE(ox820_rps, > +TIMER_OF_DECLARE(ox820_rps, > "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init); > diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c > index b4122ed..20ff33b 100644 > --- a/drivers/clocksource/timer-prima2.c > +++ b/drivers/clocksource/timer-prima2.c > @@ -245,5 +245,5 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(sirfsoc_prima2_timer, > +TIMER_OF_DECLARE(sirfsoc_prima2_timer, > "sirf,prima2-tick", sirfsoc_prima2_timer_init); > diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c > index 2d575a8c..3ac9dec 100644 > --- a/drivers/clocksource/timer-sp804.c > +++ b/drivers/clocksource/timer-sp804.c > @@ -287,7 +287,7 @@ static int __init sp804_of_init(struct device_node *np) > iounmap(base); > return ret; > } > -CLOCKSOURCE_OF_DECLARE(sp804, "arm,sp804", sp804_of_init); > +TIMER_OF_DECLARE(sp804, "arm,sp804", sp804_of_init); > > static int __init integrator_cp_of_init(struct device_node *np) > { > @@ -335,4 +335,4 @@ static int __init integrator_cp_of_init(struct device_node *np) > iounmap(base); > return ret; > } > -CLOCKSOURCE_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init); > +TIMER_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init); > diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c > index 1b2574c..174d1243 100644 > --- a/drivers/clocksource/timer-stm32.c > +++ b/drivers/clocksource/timer-stm32.c > @@ -187,4 +187,4 @@ static int __init stm32_clockevent_init(struct device_node *np) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(stm32, "st,stm32-timer", stm32_clockevent_init); > +TIMER_OF_DECLARE(stm32, "st,stm32-timer", stm32_clockevent_init); > diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c > index 2e9c830..a4ebc8f 100644 > --- a/drivers/clocksource/timer-sun5i.c > +++ b/drivers/clocksource/timer-sun5i.c > @@ -358,7 +358,7 @@ static int __init sun5i_timer_init(struct device_node *node) > > return sun5i_setup_clockevent(node, timer_base, clk, irq); > } > -CLOCKSOURCE_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer", > +TIMER_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer", > sun5i_timer_init); > -CLOCKSOURCE_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer", > +TIMER_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer", > sun5i_timer_init); > diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c > index 6240677..880a861 100644 > --- a/drivers/clocksource/timer-ti-32k.c > +++ b/drivers/clocksource/timer-ti-32k.c > @@ -124,5 +124,5 @@ static int __init ti_32k_timer_init(struct device_node *np) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(ti_32k_timer, "ti,omap-counter32k", > +TIMER_OF_DECLARE(ti_32k_timer, "ti,omap-counter32k", > ti_32k_timer_init); > diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c > index 704e40c..be34b11 100644 > --- a/drivers/clocksource/timer-u300.c > +++ b/drivers/clocksource/timer-u300.c > @@ -458,5 +458,5 @@ static int __init u300_timer_init_of(struct device_node *np) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(u300_timer, "stericsson,u300-apptimer", > +TIMER_OF_DECLARE(u300_timer, "stericsson,u300-apptimer", > u300_timer_init_of); > diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c > index 220b490..39725d3 100644 > --- a/drivers/clocksource/versatile.c > +++ b/drivers/clocksource/versatile.c > @@ -38,7 +38,7 @@ static int __init versatile_sched_clock_init(struct device_node *node) > > return 0; > } > -CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg", > +TIMER_OF_DECLARE(vexpress, "arm,vexpress-sysreg", > versatile_sched_clock_init); > -CLOCKSOURCE_OF_DECLARE(versatile, "arm,versatile-sysreg", > +TIMER_OF_DECLARE(versatile, "arm,versatile-sysreg", > versatile_sched_clock_init); > diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c > index e0849e2..0f92089 100644 > --- a/drivers/clocksource/vf_pit_timer.c > +++ b/drivers/clocksource/vf_pit_timer.c > @@ -201,4 +201,4 @@ static int __init pit_timer_init(struct device_node *np) > > return pit_clockevent_init(clk_rate, irq); > } > -CLOCKSOURCE_OF_DECLARE(vf610, "fsl,vf610-pit", pit_timer_init); > +TIMER_OF_DECLARE(vf610, "fsl,vf610-pit", pit_timer_init); > diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c > index d02b510..e0f7489 100644 > --- a/drivers/clocksource/vt8500_timer.c > +++ b/drivers/clocksource/vt8500_timer.c > @@ -165,4 +165,4 @@ static int __init vt8500_timer_init(struct device_node *np) > return 0; > } > > -CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init); > +TIMER_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init); > diff --git a/drivers/clocksource/zevio-timer.c b/drivers/clocksource/zevio-timer.c > index 9a53f5e..a6a0338 100644 > --- a/drivers/clocksource/zevio-timer.c > +++ b/drivers/clocksource/zevio-timer.c > @@ -215,4 +215,4 @@ static int __init zevio_timer_init(struct device_node *node) > return zevio_timer_add(node); > } > > -CLOCKSOURCE_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_init); > +TIMER_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_init); > diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h > index f2b10d9..a86b65f 100644 > --- a/include/linux/clocksource.h > +++ b/include/linux/clocksource.h > @@ -249,7 +249,7 @@ extern int clocksource_mmio_init(void __iomem *, const char *, > > extern int clocksource_i8253_init(void); > > -#define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ > +#define TIMER_OF_DECLARE(name, compat, fn) \ > OF_DECLARE_1_RET(clksrc, name, compat, fn) > > #ifdef CONFIG_CLKSRC_PROBE > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-28 13:48 ` Linus Walleij @ 2017-05-28 14:20 ` Daniel Lezcano 0 siblings, 0 replies; 19+ messages in thread From: Daniel Lezcano @ 2017-05-28 14:20 UTC (permalink / raw) To: Linus Walleij Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan, ARM/Rockchip On 28/05/2017 15:48, Linus Walleij wrote: > On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: > >> The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the >> clocksource at early stage. However, this macro is also used to initialize >> the clockevent if any, or the clockevent only. >> >> It was originally suggested to declare another macro to initialize a >> clockevent, so in order to separate the two entities even they belong to the >> same IP. This was not accepted because of the impact on the DT where splitting >> a clocksource/clockevent definition does not make sense as it is a Linux >> concept not a hardware description. >> >> On the other side, the clocksource has not interrupt declared while the >> clockevent has, so it is easy from the driver to know if the description is >> for a clockevent or a clocksource, IOW it could be implemented at the driver >> level. >> >> So instead of dealing with a named clocksource macro, let's use a more generic >> one: TIMER_OF_DECLARE. >> >> The patch has not functional changes. >> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>' > > This makes the macro make sense and I had this idea one time too. > Awesome. > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Thanks Linus for reviewing the series. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano 2017-05-28 13:48 ` Linus Walleij @ 2017-05-29 7:39 ` Heiko Stübner 2017-05-29 8:00 ` Neil Armstrong ` (4 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Heiko Stübner @ 2017-05-29 7:39 UTC (permalink / raw) To: Daniel Lezcano Cc: tglx, linux-arm-kernel, linux-kernel, Russell King, Michal Simek, John Crispin, Ralf Baechle, Ley Foon Tan, Vineet Gupta, Mark Rutland, Marc Zyngier, Patrice Chotard, Maxime Coquelin, Alexandre Torgue, Florian Fainelli, Ray Jui, Scott Branden, maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..., Stephen Warren Am Samstag, 27. Mai 2017, 11:58:43 CEST schrieb Daniel Lezcano: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where > splitting a clocksource/clockevent definition does not make sense as it is > a Linux concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more > generic one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- [...] > diff --git a/drivers/clocksource/rockchip_timer.c > b/drivers/clocksource/rockchip_timer.c index 49c02be..c27f4c8 100644 > --- a/drivers/clocksource/rockchip_timer.c > +++ b/drivers/clocksource/rockchip_timer.c > @@ -303,5 +303,5 @@ static int __init rk_timer_init(struct device_node *np) > return -EINVAL; > } > > -CLOCKSOURCE_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer", > rk_timer_init); -CLOCKSOURCE_OF_DECLARE(rk3399_timer, > "rockchip,rk3399-timer", rk_timer_init); +TIMER_OF_DECLARE(rk3288_timer, > "rockchip,rk3288-timer", rk_timer_init); +TIMER_OF_DECLARE(rk3399_timer, > "rockchip,rk3399-timer", rk_timer_init); diff --git > a/drivers/clocksource/samsung_pwm_timer.c > b/drivers/clocksource/samsung_pwm_timer.c index a68e653..21cd72c 100644 Acked-by: Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano 2017-05-28 13:48 ` Linus Walleij 2017-05-29 7:39 ` Heiko Stübner @ 2017-05-29 8:00 ` Neil Armstrong 2017-05-29 8:41 ` Arnd Bergmann ` (3 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Neil Armstrong @ 2017-05-29 8:00 UTC (permalink / raw) To: Daniel Lezcano, tglx Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan, ARM/Rockchip On 05/27/2017 11:58 AM, Daniel Lezcano wrote: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where splitting > a clocksource/clockevent definition does not make sense as it is a Linux > concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > arch/arm/kernel/smp_twd.c | 6 +++--- > arch/microblaze/kernel/timer.c | 2 +- > arch/mips/ralink/cevt-rt3352.c | 2 +- > arch/nios2/kernel/time.c | 2 +- > drivers/clocksource/arc_timer.c | 6 +++--- > drivers/clocksource/arm_arch_timer.c | 6 +++--- > drivers/clocksource/arm_global_timer.c | 2 +- > drivers/clocksource/armv7m_systick.c | 2 +- > drivers/clocksource/asm9260_timer.c | 2 +- > drivers/clocksource/bcm2835_timer.c | 2 +- > drivers/clocksource/bcm_kona_timer.c | 4 ++-- > drivers/clocksource/cadence_ttc_timer.c | 2 +- > drivers/clocksource/clksrc-dbx500-prcmu.c | 2 +- > drivers/clocksource/clksrc_st_lpc.c | 2 +- > drivers/clocksource/clps711x-timer.c | 2 +- > drivers/clocksource/dw_apb_timer_of.c | 8 ++++---- > drivers/clocksource/exynos_mct.c | 4 ++-- > drivers/clocksource/fsl_ftm_timer.c | 2 +- > drivers/clocksource/h8300_timer16.c | 2 +- > drivers/clocksource/h8300_timer8.c | 2 +- > drivers/clocksource/h8300_tpu.c | 2 +- > drivers/clocksource/jcore-pit.c | 2 +- > drivers/clocksource/meson6_timer.c | 2 +- > drivers/clocksource/mips-gic-timer.c | 2 +- > drivers/clocksource/mps2-timer.c | 2 +- > drivers/clocksource/mtk_timer.c | 2 +- > drivers/clocksource/mxs_timer.c | 2 +- > drivers/clocksource/nomadik-mtu.c | 2 +- > drivers/clocksource/pxa_timer.c | 2 +- > drivers/clocksource/qcom-timer.c | 4 ++-- > drivers/clocksource/renesas-ostm.c | 2 +- > drivers/clocksource/rockchip_timer.c | 4 ++-- > drivers/clocksource/samsung_pwm_timer.c | 8 ++++---- > drivers/clocksource/sun4i_timer.c | 2 +- > drivers/clocksource/tango_xtal.c | 2 +- > drivers/clocksource/tegra20_timer.c | 4 ++-- > drivers/clocksource/time-armada-370-xp.c | 6 +++--- > drivers/clocksource/time-efm32.c | 4 ++-- > drivers/clocksource/time-lpc32xx.c | 2 +- > drivers/clocksource/time-orion.c | 2 +- > drivers/clocksource/time-pistachio.c | 2 +- > drivers/clocksource/timer-atlas7.c | 2 +- > drivers/clocksource/timer-atmel-pit.c | 2 +- > drivers/clocksource/timer-atmel-st.c | 2 +- > drivers/clocksource/timer-digicolor.c | 2 +- > drivers/clocksource/timer-fttmr010.c | 10 +++++----- > drivers/clocksource/timer-imx-gpt.c | 24 ++++++++++++------------ > drivers/clocksource/timer-integrator-ap.c | 2 +- > drivers/clocksource/timer-keystone.c | 2 +- > drivers/clocksource/timer-nps.c | 6 +++--- > drivers/clocksource/timer-oxnas-rps.c | 4 ++-- > drivers/clocksource/timer-prima2.c | 2 +- > drivers/clocksource/timer-sp804.c | 4 ++-- > drivers/clocksource/timer-stm32.c | 2 +- > drivers/clocksource/timer-sun5i.c | 4 ++-- > drivers/clocksource/timer-ti-32k.c | 2 +- > drivers/clocksource/timer-u300.c | 2 +- > drivers/clocksource/versatile.c | 4 ++-- > drivers/clocksource/vf_pit_timer.c | 2 +- > drivers/clocksource/vt8500_timer.c | 2 +- > drivers/clocksource/zevio-timer.c | 2 +- > include/linux/clocksource.h | 2 +- > 62 files changed, 103 insertions(+), 103 deletions(-) > [...] > diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c > index d630bf4..eed6fef 100644 > --- a/drivers/clocksource/timer-oxnas-rps.c > +++ b/drivers/clocksource/timer-oxnas-rps.c > @@ -293,7 +293,7 @@ static int __init oxnas_rps_timer_init(struct device_node *np) > return ret; > } > > -CLOCKSOURCE_OF_DECLARE(ox810se_rps, > +TIMER_OF_DECLARE(ox810se_rps, > "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); > -CLOCKSOURCE_OF_DECLARE(ox820_rps, > +TIMER_OF_DECLARE(ox820_rps, > "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init); [...] For the timer-oxnas-rps driver, Acked-by: Neil Armstrong <narmstrong@baylibre.com> Thanks for the rework, Neil ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano ` (2 preceding siblings ...) 2017-05-29 8:00 ` Neil Armstrong @ 2017-05-29 8:41 ` Arnd Bergmann [not found] ` <CAK8P3a3QACHYqtCO1z_FpW0nXEtx356wCDha_=SNXU872=q1UQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> [not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> ` (2 subsequent siblings) 6 siblings, 1 reply; 19+ messages in thread From: Arnd Bergmann @ 2017-05-29 8:41 UTC (permalink / raw) To: Daniel Lezcano Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where splitting > a clocksource/clockevent definition does not make sense as it is a Linux > concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Could you either leave the old name as an alias for one release, or introduce the new name as an alias now for 4.13? I think that that would make it easier to merge new drivers. Otherwise this looks good to me, Acked-by: Arnd Bergmann <arnd@arndb.de> ^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <CAK8P3a3QACHYqtCO1z_FpW0nXEtx356wCDha_=SNXU872=q1UQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE [not found] ` <CAK8P3a3QACHYqtCO1z_FpW0nXEtx356wCDha_=SNXU872=q1UQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2017-05-29 8:48 ` Daniel Lezcano 2017-05-29 9:57 ` Arnd Bergmann 0 siblings, 1 reply; 19+ messages in thread From: Daniel Lezcano @ 2017-05-29 8:48 UTC (permalink / raw) To: Arnd Bergmann Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On Mon, May 29, 2017 at 10:41:52AM +0200, Arnd Bergmann wrote: > On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: > > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > > clocksource at early stage. However, this macro is also used to initialize > > the clockevent if any, or the clockevent only. > > > > It was originally suggested to declare another macro to initialize a > > clockevent, so in order to separate the two entities even they belong to the > > same IP. This was not accepted because of the impact on the DT where splitting > > a clocksource/clockevent definition does not make sense as it is a Linux > > concept not a hardware description. > > > > On the other side, the clocksource has not interrupt declared while the > > clockevent has, so it is easy from the driver to know if the description is > > for a clockevent or a clocksource, IOW it could be implemented at the driver > > level. > > > > So instead of dealing with a named clocksource macro, let's use a more generic > > one: TIMER_OF_DECLARE. > > > > The patch has not functional changes. > > > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > Could you either leave the old name as an alias for one release, or introduce > the new name as an alias now for 4.13? > > I think that that would make it easier to merge new drivers. Otherwise this > looks good to me, New drivers should go through my tree, so I can catch them with the old macro name and do the change. > Acked-by: Arnd Bergmann <arnd@arndb.de> Thanks for the review. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-29 8:48 ` Daniel Lezcano @ 2017-05-29 9:57 ` Arnd Bergmann [not found] ` <CAK8P3a1Kv_RhKL43ie6co_N5pDXvRHd7Uq8g70qt80WkxuhzLw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 19+ messages in thread From: Arnd Bergmann @ 2017-05-29 9:57 UTC (permalink / raw) To: Daniel Lezcano Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On Mon, May 29, 2017 at 10:48 AM, Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: > On Mon, May 29, 2017 at 10:41:52AM +0200, Arnd Bergmann wrote: >> On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano >> <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: >> > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the >> > clocksource at early stage. However, this macro is also used to initialize >> > the clockevent if any, or the clockevent only. >> > >> > It was originally suggested to declare another macro to initialize a >> > clockevent, so in order to separate the two entities even they belong to the >> > same IP. This was not accepted because of the impact on the DT where splitting >> > a clocksource/clockevent definition does not make sense as it is a Linux >> > concept not a hardware description. >> > >> > On the other side, the clocksource has not interrupt declared while the >> > clockevent has, so it is easy from the driver to know if the description is >> > for a clockevent or a clocksource, IOW it could be implemented at the driver >> > level. >> > >> > So instead of dealing with a named clocksource macro, let's use a more generic >> > one: TIMER_OF_DECLARE. >> > >> > The patch has not functional changes. >> > >> > Signed-off-by: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> >> >> Could you either leave the old name as an alias for one release, or introduce >> the new name as an alias now for 4.13? >> >> I think that that would make it easier to merge new drivers. Otherwise this >> looks good to me, > > > New drivers should go through my tree, so I can catch them with the old macro > name and do the change. Sure, they should, and it's quite likely that you won't even need the fallback, I've just seen too many cases where a similar assumption turned out wrong, that I'd just pick the safer option just in case whenever I do an API change. Things that could go wrong include: - A platform maintainer wants to add a new platform and has a for-next branch that gets merged into linux-next, with parts of it going through different maintainers, and now they have to choose between a branch that doesn't build without the timer branch, or one that break for-next unless Stephen applies a fixup - Some architecture maintainer didn't get the memo and adds an instance of CLOCKSOUCE_OF_DECLARE in architecture specific code without asking having the patch reviewed first - A platform has a branch with complex cross-tree dependencies and it need to get merged in an unconventional way. - You make a mistake and accidentally merge one driver for an unusual architecture that escapes your test matrix. While those all are unlikely to happen in a particular merge window, they do happen occasionally and tend to cause a lot of pain. Arnd ^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <CAK8P3a1Kv_RhKL43ie6co_N5pDXvRHd7Uq8g70qt80WkxuhzLw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE [not found] ` <CAK8P3a1Kv_RhKL43ie6co_N5pDXvRHd7Uq8g70qt80WkxuhzLw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2017-05-29 10:55 ` Daniel Lezcano 2017-05-29 11:21 ` Arnd Bergmann 0 siblings, 1 reply; 19+ messages in thread From: Daniel Lezcano @ 2017-05-29 10:55 UTC (permalink / raw) To: Arnd Bergmann Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On Mon, May 29, 2017 at 11:57:25AM +0200, Arnd Bergmann wrote: > On Mon, May 29, 2017 at 10:48 AM, Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: > > On Mon, May 29, 2017 at 10:41:52AM +0200, Arnd Bergmann wrote: > >> On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano > >> <daniel.lezcano@linaro.org> wrote: > >> > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > >> > clocksource at early stage. However, this macro is also used to initialize > >> > the clockevent if any, or the clockevent only. > >> > > >> > It was originally suggested to declare another macro to initialize a > >> > clockevent, so in order to separate the two entities even they belong to the > >> > same IP. This was not accepted because of the impact on the DT where splitting > >> > a clocksource/clockevent definition does not make sense as it is a Linux > >> > concept not a hardware description. > >> > > >> > On the other side, the clocksource has not interrupt declared while the > >> > clockevent has, so it is easy from the driver to know if the description is > >> > for a clockevent or a clocksource, IOW it could be implemented at the driver > >> > level. > >> > > >> > So instead of dealing with a named clocksource macro, let's use a more generic > >> > one: TIMER_OF_DECLARE. > >> > > >> > The patch has not functional changes. > >> > > >> > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > >> > >> Could you either leave the old name as an alias for one release, or introduce > >> the new name as an alias now for 4.13? > >> > >> I think that that would make it easier to merge new drivers. Otherwise this > >> looks good to me, > > > > > > New drivers should go through my tree, so I can catch them with the old macro > > name and do the change. > > Sure, they should, and it's quite likely that you won't even need the fallback, > I've just seen too many cases where a similar assumption turned out wrong, > that I'd just pick the safer option just in case whenever I do an API change. > > Things that could go wrong include: > > - A platform maintainer wants to add a new platform and has a for-next > branch that gets merged into linux-next, with parts of it going through > different maintainers, and now they have to choose between a branch > that doesn't build without the timer branch, or one that break for-next > unless Stephen applies a fixup > > - Some architecture maintainer didn't get the memo and adds an instance of > CLOCKSOUCE_OF_DECLARE in architecture specific code without asking > having the patch reviewed first > > - A platform has a branch with complex cross-tree dependencies and > it need to get merged in an unconventional way. > > - You make a mistake and accidentally merge one driver for an unusual > architecture that escapes your test matrix. > > While those all are unlikely to happen in a particular merge window, they do > happen occasionally and tend to cause a lot of pain. Hmm, that sounds scary :) There is no guarantee, when removing the alias, none of the above happens, right? If the timer branch is in linux-next, that could be caugth before any of the above happens, no? I'm not against adding an alias, just checking out if it is worth to. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-29 10:55 ` Daniel Lezcano @ 2017-05-29 11:21 ` Arnd Bergmann 0 siblings, 0 replies; 19+ messages in thread From: Arnd Bergmann @ 2017-05-29 11:21 UTC (permalink / raw) To: Daniel Lezcano Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On Mon, May 29, 2017 at 12:55 PM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On Mon, May 29, 2017 at 11:57:25AM +0200, Arnd Bergmann wrote: >> On Mon, May 29, 2017 at 10:48 AM, Daniel Lezcano >> <daniel.lezcano@linaro.org> wrote: >> Things that could go wrong include: >> >> - A platform maintainer wants to add a new platform and has a for-next >> branch that gets merged into linux-next, with parts of it going through >> different maintainers, and now they have to choose between a branch >> that doesn't build without the timer branch, or one that break for-next >> unless Stephen applies a fixup >> >> - Some architecture maintainer didn't get the memo and adds an instance of >> CLOCKSOUCE_OF_DECLARE in architecture specific code without asking >> having the patch reviewed first >> >> - A platform has a branch with complex cross-tree dependencies and >> it need to get merged in an unconventional way. >> >> - You make a mistake and accidentally merge one driver for an unusual >> architecture that escapes your test matrix. >> >> While those all are unlikely to happen in a particular merge window, they do >> happen occasionally and tend to cause a lot of pain. > > Hmm, that sounds scary :) > > There is no guarantee, when removing the alias, none of the above happens, > right? No, it's just both less likely and easier to work around. > If the timer branch is in linux-next, that could be caugth before any of the > above happens, no? linux-next will find most of these problems, but it will still be more work for the people that run into build failures when testing linux-next. Arnd ^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <1495879129-28109-2-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE [not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> @ 2017-05-29 13:25 ` Matthias Brugger 2017-05-31 8:19 ` Krzysztof Kozlowski 1 sibling, 0 replies; 19+ messages in thread From: Matthias Brugger @ 2017-05-29 13:25 UTC (permalink / raw) To: Daniel Lezcano, tglx-hfZtesqFncYOwBW4kG4KsQ Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On 27/05/17 11:58, Daniel Lezcano wrote: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where splitting > a clocksource/clockevent definition does not make sense as it is a Linux > concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > --- [...] > diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c > index 9065949..f9b724f 100644 > --- a/drivers/clocksource/mtk_timer.c > +++ b/drivers/clocksource/mtk_timer.c > @@ -265,4 +265,4 @@ static int __init mtk_timer_init(struct device_node *node) > > return -EINVAL; > } > -CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); > +TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); For the mediatek driver: Acked-by: Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE [not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-05-29 13:25 ` Matthias Brugger @ 2017-05-31 8:19 ` Krzysztof Kozlowski 1 sibling, 0 replies; 19+ messages in thread From: Krzysztof Kozlowski @ 2017-05-31 8:19 UTC (permalink / raw) To: Daniel Lezcano Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan <shc> On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where splitting > a clocksource/clockevent definition does not make sense as it is a Linux > concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > --- > arch/arm/kernel/smp_twd.c | 6 +++--- > arch/microblaze/kernel/timer.c | 2 +- > arch/mips/ralink/cevt-rt3352.c | 2 +- > arch/nios2/kernel/time.c | 2 +- > drivers/clocksource/arc_timer.c | 6 +++--- > drivers/clocksource/arm_arch_timer.c | 6 +++--- > drivers/clocksource/arm_global_timer.c | 2 +- > drivers/clocksource/armv7m_systick.c | 2 +- > drivers/clocksource/asm9260_timer.c | 2 +- > drivers/clocksource/bcm2835_timer.c | 2 +- > drivers/clocksource/bcm_kona_timer.c | 4 ++-- > drivers/clocksource/cadence_ttc_timer.c | 2 +- > drivers/clocksource/clksrc-dbx500-prcmu.c | 2 +- > drivers/clocksource/clksrc_st_lpc.c | 2 +- > drivers/clocksource/clps711x-timer.c | 2 +- > drivers/clocksource/dw_apb_timer_of.c | 8 ++++---- > drivers/clocksource/exynos_mct.c | 4 ++-- > drivers/clocksource/fsl_ftm_timer.c | 2 +- > drivers/clocksource/h8300_timer16.c | 2 +- > drivers/clocksource/h8300_timer8.c | 2 +- > drivers/clocksource/h8300_tpu.c | 2 +- > drivers/clocksource/jcore-pit.c | 2 +- > drivers/clocksource/meson6_timer.c | 2 +- > drivers/clocksource/mips-gic-timer.c | 2 +- > drivers/clocksource/mps2-timer.c | 2 +- > drivers/clocksource/mtk_timer.c | 2 +- > drivers/clocksource/mxs_timer.c | 2 +- > drivers/clocksource/nomadik-mtu.c | 2 +- > drivers/clocksource/pxa_timer.c | 2 +- > drivers/clocksource/qcom-timer.c | 4 ++-- > drivers/clocksource/renesas-ostm.c | 2 +- > drivers/clocksource/rockchip_timer.c | 4 ++-- > drivers/clocksource/samsung_pwm_timer.c | 8 ++++---- For exynos_mct and samsung_pwm_timer: Acked-by: Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano ` (4 preceding siblings ...) [not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> @ 2017-05-30 16:36 ` Vineet Gupta 2017-05-31 7:11 ` Patrice CHOTARD 6 siblings, 0 replies; 19+ messages in thread From: Vineet Gupta @ 2017-05-30 16:36 UTC (permalink / raw) To: Daniel Lezcano, tglx Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Patrice Chotard, Eric Anholt, Thierry Reding, Ingo Molnar, open list:ARM/STI ARCHITECTURE, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Floria On 05/27/2017 02:58 AM, Daniel Lezcano wrote: ... > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > ... > drivers/clocksource/arc_timer.c | 6 +++--- ... > diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c > index 2164973..4927355 100644 > --- a/drivers/clocksource/arc_timer.c > +++ b/drivers/clocksource/arc_timer.c > @@ -99,7 +99,7 @@ static int __init arc_cs_setup_gfrc(struct device_node *node) > > return clocksource_register_hz(&arc_counter_gfrc, arc_timer_freq); > } > -CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); > +TIMER_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); > > #define AUX_RTC_CTRL 0x103 > #define AUX_RTC_LOW 0x104 > @@ -158,7 +158,7 @@ static int __init arc_cs_setup_rtc(struct device_node *node) > > return clocksource_register_hz(&arc_counter_rtc, arc_timer_freq); > } > -CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); > +TIMER_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); > > #endif > > @@ -333,4 +333,4 @@ static int __init arc_of_timer_init(struct device_node *np) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init); > +TIMER_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init); Acked-by: Vineet Gupta vgupta@snyopsys.com Thx, -Vineet ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano ` (5 preceding siblings ...) 2017-05-30 16:36 ` Vineet Gupta @ 2017-05-31 7:11 ` Patrice CHOTARD 6 siblings, 0 replies; 19+ messages in thread From: Patrice CHOTARD @ 2017-05-31 7:11 UTC (permalink / raw) To: Daniel Lezcano, tglx@linutronix.de Cc: Mark Rutland, open list:RALINK MIPS ARCHITECTURE, Baruch Siach, Heiko Stuebner, Neil Armstrong, Linus Walleij, Santosh Shilimkar, Liviu Dudau, moderated list:ARM/OXNAS platform support, Eric Anholt, Thierry Reding, Ingo Molnar, Alexandre Courbot, moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Florian Fainelli, moderated list:H8/300 ARCHITECTURE, Alexander Shiyan, open list:ARM/Rockchip SoC support, Kevin Hi Daniel On 05/27/2017 11:58 AM, Daniel Lezcano wrote: > The CLOCKSOUCE_OF_DECLARE macro is used widely for the timers to declare the > clocksource at early stage. However, this macro is also used to initialize > the clockevent if any, or the clockevent only. > > It was originally suggested to declare another macro to initialize a > clockevent, so in order to separate the two entities even they belong to the > same IP. This was not accepted because of the impact on the DT where splitting > a clocksource/clockevent definition does not make sense as it is a Linux > concept not a hardware description. > > On the other side, the clocksource has not interrupt declared while the > clockevent has, so it is easy from the driver to know if the description is > for a clockevent or a clocksource, IOW it could be implemented at the driver > level. > > So instead of dealing with a named clocksource macro, let's use a more generic > one: TIMER_OF_DECLARE. > > The patch has not functional changes. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- [...] > diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c > index 03cc492..a1d01eb 100644 > --- a/drivers/clocksource/clksrc_st_lpc.c > +++ b/drivers/clocksource/clksrc_st_lpc.c > @@ -132,4 +132,4 @@ static int __init st_clksrc_of_register(struct device_node *np) > > return ret; > } > -CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > +TIMER_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); For the STi driver: Acked-by: Patrice Chotard <patrice.chotard@st.com> Thanks ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF [not found] <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> 2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano @ 2017-05-27 9:58 ` Daniel Lezcano 2017-05-28 3:00 ` Shawn Guo ` (2 more replies) 1 sibling, 3 replies; 19+ messages in thread From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw) To: tglx, daniel.lezcano Cc: linux-arm-kernel, linux-kernel, Russell King, Florian Fainelli, Ray Jui, Scott Branden, maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..., Alexander Shiyan, Shawn Guo, Sascha Hauer, Fabio Estevam, Kukjin Kim, Krzysztof Kozlowski, Javier Martinez Canillas, Catalin Marinas, Will Deacon, Yoshinori Sato, Michal Simek, John The config option name is now renamed to 'TIMER_OF' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/Kconfig | 10 +++--- arch/arm/mach-bcm/Kconfig | 2 +- arch/arm/mach-clps711x/Kconfig | 2 +- arch/arm/mach-imx/epit.c | 2 +- arch/arm/mach-s3c24xx/Kconfig | 2 +- arch/arm/mach-s3c64xx/Kconfig | 2 +- arch/arm64/Kconfig.platforms | 4 +-- arch/h8300/Kconfig | 2 +- arch/microblaze/Kconfig | 2 +- arch/mips/ralink/Kconfig | 2 +- arch/nios2/Kconfig | 2 +- arch/sh/boards/Kconfig | 2 +- drivers/clocksource/Kconfig | 60 ++++++++++++++++----------------- drivers/clocksource/Makefile | 2 +- drivers/clocksource/clksrc-probe.c | 55 ------------------------------ drivers/clocksource/clps711x-timer.c | 2 +- drivers/clocksource/samsung_pwm_timer.c | 2 +- drivers/clocksource/timer-probe.c | 55 ++++++++++++++++++++++++++++++ include/asm-generic/vmlinux.lds.h | 2 +- include/linux/clocksource.h | 2 +- 20 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 drivers/clocksource/clksrc-probe.c create mode 100644 drivers/clocksource/timer-probe.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0d4e71b..713dbbb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -337,7 +337,7 @@ config ARCH_MULTIPLATFORM select ARM_HAS_SG_CHAIN select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR - select CLKSRC_OF + select TIMER_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI @@ -351,7 +351,7 @@ config ARM_SINGLE_ARMV7M depends on !MMU select ARM_NVIC select AUTO_ZRELADDR - select CLKSRC_OF + select TIMER_OF select COMMON_CLK select CPU_V7M select GENERIC_CLOCKEVENTS @@ -541,7 +541,7 @@ config ARCH_PXA select CLKDEV_LOOKUP select CLKSRC_PXA select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF select CPU_XSCALE if !CPU_XSC3 select GENERIC_CLOCKEVENTS select GPIO_PXA @@ -580,7 +580,7 @@ config ARCH_SA1100 select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_PXA - select CLKSRC_OF if OF + select TIMER_OF if OF select CPU_FREQ select CPU_SA1100 select GENERIC_CLOCKEVENTS @@ -1386,7 +1386,7 @@ config HAVE_ARM_ARCH_TIMER config HAVE_ARM_TWD bool - select CLKSRC_OF if OF + select TIMER_OF if OF help This options enables support for the ARM timer and watchdog unit diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index a0e66d8..d6e291b8 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -150,7 +150,7 @@ config ARCH_BCM2835 select ARM_ERRATA_411920 if ARCH_MULTI_V6 select ARM_TIMER_SP804 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 - select CLKSRC_OF + select TIMER_OF select BCM2835_TIMER select PINCTRL select PINCTRL_BCM2835 diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 61284b9..f385b1f 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -2,7 +2,7 @@ menuconfig ARCH_CLPS711X bool "Cirrus Logic EP721x/EP731x-based" depends on ARCH_MULTI_V4T select AUTO_ZRELADDR - select CLKSRC_OF + select TIMER_OF select CLPS711X_TIMER select COMMON_CLK select CPU_ARM720T diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c index fb9a73a..4a4d2e2 100644 --- a/arch/arm/mach-imx/epit.c +++ b/arch/arm/mach-imx/epit.c @@ -39,7 +39,7 @@ #define EPITCR_OM_TOGGLE (1 << 22) #define EPITCR_OM_CLEAR (2 << 22) #define EPITCR_OM_SET (3 << 22) -#define EPITCR_CLKSRC_OFF (0 << 24) +#define EPITCR_TIMER_OFF (0 << 24) #define EPITCR_CLKSRC_PERIPHERAL (1 << 24) #define EPITCR_CLKSRC_REF_HIGH (1 << 24) #define EPITCR_CLKSRC_REF_LOW (3 << 24) diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 4b1690a..f07da82 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -394,7 +394,7 @@ config MACH_SMDK2416 config MACH_S3C2416_DT bool "Samsung S3C2416 machine using devicetree" - select CLKSRC_OF + select TIMER_OF select USE_OF select PINCTRL select PINCTRL_S3C24XX diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 459214f..71a4934 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -336,7 +336,7 @@ config MACH_WLF_CRAGG_6410 config MACH_S3C64XX_DT bool "Samsung S3C6400/S3C6410 machine using Device Tree" - select CLKSRC_OF + select TIMER_OF select CPU_S3C6400 select CPU_S3C6410 select PINCTRL diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 129cc5a..611abc4 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -17,7 +17,7 @@ config ARCH_ALPINE config ARCH_BCM2835 bool "Broadcom BCM2835 family" - select CLKSRC_OF + select TIMER_OF select GPIOLIB select PINCTRL select PINCTRL_BCM2835 @@ -170,7 +170,7 @@ config ARCH_TEGRA select ARCH_HAS_RESET_CONTROLLER select CLKDEV_LOOKUP select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF select GENERIC_CLOCKEVENTS select GPIOLIB select PINCTRL diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 3ae8525..6e3d36f 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -15,7 +15,7 @@ config H8300 select OF_IRQ select OF_EARLY_FLATTREE select HAVE_MEMBLOCK - select CLKSRC_OF + select TIMER_OF select H8300_TMR8 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZO diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 85885a5..8e47121 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -4,7 +4,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_EXTABLE_SORT - select CLKSRC_OF + select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK select GENERIC_ATOMIC64 diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 9825dee..710b04c 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -4,7 +4,7 @@ config CLKEVT_RT3352 bool depends on SOC_RT305X || SOC_MT7620 default y - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO config RALINK_ILL_ACC diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 51a56c8..863f388 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -1,6 +1,6 @@ config NIOS2 def_bool y - select CLKSRC_OF + select TIMER_OF select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 4e21949..3554fca 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -10,7 +10,7 @@ config SH_DEVICE_TREE bool "Board Described by Device Tree" select OF select OF_EARLY_FLATTREE - select CLKSRC_OF + select TIMER_OF select COMMON_CLK select GENERIC_CALIBRATE_DELAY help diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 623fcc6..90f062e 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -1,15 +1,15 @@ menu "Clock Source drivers" depends on !ARCH_USES_GETTIMEOFFSET -config CLKSRC_OF +config TIMER_OF bool - select CLKSRC_PROBE + select TIMER_PROBE config CLKSRC_ACPI bool - select CLKSRC_PROBE + select TIMER_PROBE -config CLKSRC_PROBE +config TIMER_PROBE bool config CLKSRC_I8253 @@ -58,14 +58,14 @@ config DW_APB_TIMER config DW_APB_TIMER_OF bool select DW_APB_TIMER - select CLKSRC_OF + select TIMER_OF config FTTMR010_TIMER bool "Faraday Technology timer driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS depends on HAS_IOMEM select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF select MFD_SYSCON help Enables support for the Faraday Technology timer block @@ -74,7 +74,7 @@ config FTTMR010_TIMER config ROCKCHIP_TIMER bool "Rockchip timer driver" if COMPILE_TEST depends on ARM || ARM64 - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Enables the support for the rockchip timer driver. @@ -82,7 +82,7 @@ config ROCKCHIP_TIMER config ARMADA_370_XP_TIMER bool "Armada 370 and XP timer driver" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Enables the support for the Armada 370 and XP timer driver. @@ -97,7 +97,7 @@ config MESON6_TIMER config ORION_TIMER bool "Orion timer driver" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Enables the support for the Orion timer driver @@ -141,7 +141,7 @@ config ASM9260_TIMER bool "ASM9260 timer driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF help Enables support for the ASM9260 timer. @@ -247,21 +247,21 @@ config CLKSRC_LPC32XX depends on GENERIC_CLOCKEVENTS && HAS_IOMEM depends on ARM select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF help Support for the LPC32XX clocksource. config CLKSRC_PISTACHIO bool "Clocksource for Pistachio SoC" if COMPILE_TEST depends on HAS_IOMEM - select CLKSRC_OF + select TIMER_OF help Enables the clocksource for the Pistachio SoC. config CLKSRC_TI_32K bool "Texas Instruments 32.768 Hz Clocksource" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK - select CLKSRC_OF if OF + select TIMER_OF if OF help This option enables support for Texas Instruments 32.768 Hz clocksource available on many OMAP-like platforms. @@ -270,7 +270,7 @@ config CLKSRC_NPS bool "NPS400 clocksource driver" if COMPILE_TEST depends on !PHYS_ADDR_T_64BIT select CLKSRC_MMIO - select CLKSRC_OF if OF + select TIMER_OF if OF help NPS400 clocksource support. Got 64 bit counter with update rate up to 1000MHz. @@ -285,12 +285,12 @@ config CLKSRC_MPS2 bool "Clocksource for MPS2 SoCs" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF config ARC_TIMERS bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS - select CLKSRC_OF + select TIMER_OF help These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores (ARC700 as well as ARC HS38). @@ -300,7 +300,7 @@ config ARC_TIMERS_64BIT bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS depends on ARC_TIMERS - select CLKSRC_OF + select TIMER_OF help This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP) RTC is implemented inside the core, while GFRC sits outside the core in @@ -309,7 +309,7 @@ config ARC_TIMERS_64BIT config ARM_ARCH_TIMER bool - select CLKSRC_OF if OF + select TIMER_OF if OF select CLKSRC_ACPI if ACPI config ARM_ARCH_TIMER_EVTSTREAM @@ -367,7 +367,7 @@ config ARM64_ERRATUM_858921 config ARM_GLOBAL_TIMER bool "Support for the ARM global timer" if COMPILE_TEST - select CLKSRC_OF if OF + select TIMER_OF if OF depends on ARM help This options enables support for the ARM global timer unit @@ -376,7 +376,7 @@ config ARM_TIMER_SP804 bool "Support for Dual Timer SP804 module" depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP select CLKSRC_MMIO - select CLKSRC_OF if OF + select TIMER_OF if OF config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK bool @@ -387,19 +387,19 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK config ARMV7M_SYSTICK bool "Support for the ARMv7M system time" if COMPILE_TEST - select CLKSRC_OF if OF + select TIMER_OF if OF select CLKSRC_MMIO help This options enables support for the ARMv7M system timer unit config ATMEL_PIT - select CLKSRC_OF if OF + select TIMER_OF if OF def_bool SOC_AT91SAM9 || SOC_SAMA5 config ATMEL_ST bool "Atmel ST timer support" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS - select CLKSRC_OF + select TIMER_OF select MFD_SYSCON help Support for the Atmel ST timer. @@ -442,7 +442,7 @@ config VF_PIT_TIMER config OXNAS_RPS_TIMER bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help This enables support for the Oxford Semiconductor OXNAS RPS timers. @@ -453,7 +453,7 @@ config SYS_SUPPORTS_SH_CMT config MTK_TIMER bool "Mediatek timer driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS && HAS_IOMEM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Support for Mediatek timer driver. @@ -526,7 +526,7 @@ config EM_TIMER_STI config CLKSRC_QCOM bool "Qualcomm MSM timer" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF help This enables the clocksource and the per CPU clockevent driver for the Qualcomm SoCs. @@ -534,7 +534,7 @@ config CLKSRC_QCOM config CLKSRC_VERSATILE bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET - select CLKSRC_OF + select TIMER_OF default y if MFD_VEXPRESS_SYSREG help This option enables clock source based on free running @@ -545,12 +545,12 @@ config CLKSRC_VERSATILE config CLKSRC_MIPS_GIC bool depends on MIPS_GIC - select CLKSRC_OF + select TIMER_OF config CLKSRC_TANGO_XTAL bool "Clocksource for Tango SoC" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help This enables the clocksource for Tango SoC @@ -591,7 +591,7 @@ config CLKSRC_IMX_GPT config CLKSRC_ST_LPC bool "Low power clocksource found in the LPC" if COMPILE_TEST - select CLKSRC_OF if OF + select TIMER_OF if OF depends on HAS_IOMEM select CLKSRC_MMIO help diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index cad713c..ec55921 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o +obj-$(CONFIG_TIMER_PROBE) += timer-probe.o obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c deleted file mode 100644 index da81e5d..0000000 --- a/drivers/clocksource/clksrc-probe.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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/acpi.h> -#include <linux/init.h> -#include <linux/of.h> -#include <linux/clocksource.h> - -extern struct of_device_id __timer_of_table[]; - -static const struct of_device_id __timer_of_table_sentinel - __used __section(__timer_of_table_end); - -void __init timer_probe(void) -{ - struct device_node *np; - const struct of_device_id *match; - of_init_fn_1_ret init_func_ret; - unsigned timers = 0; - int ret; - - for_each_matching_node_and_match(np, __timer_of_table, &match) { - if (!of_device_is_available(np)) - continue; - - init_func_ret = match->data; - - ret = init_func_ret(np); - if (ret) { - pr_err("Failed to initialize '%s': %d\n", - of_node_full_name(np), ret); - continue; - } - - timers++; - } - - timers += acpi_probe_device_table(timer); - - if (!timers) - pr_crit("%s: no matching timers found\n", __func__); -} diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c index fc9e025..a8dd805 100644 --- a/drivers/clocksource/clps711x-timer.c +++ b/drivers/clocksource/clps711x-timer.c @@ -103,7 +103,7 @@ void __init clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base, BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq)); } -#ifdef CONFIG_CLKSRC_OF +#ifdef CONFIG_TIMER_OF static int __init clps711x_timer_init(struct device_node *np) { unsigned int irq = irq_of_parse_and_map(np, 0); diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 21cd72c..6d5d126 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -418,7 +418,7 @@ void __init samsung_pwm_clocksource_init(void __iomem *base, _samsung_pwm_clocksource_init(); } -#ifdef CONFIG_CLKSRC_OF +#ifdef CONFIG_TIMER_OF static int __init samsung_pwm_alloc(struct device_node *np, const struct samsung_pwm_variant *variant) { diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c new file mode 100644 index 0000000..da81e5d --- /dev/null +++ b/drivers/clocksource/timer-probe.c @@ -0,0 +1,55 @@ +/* + * 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/acpi.h> +#include <linux/init.h> +#include <linux/of.h> +#include <linux/clocksource.h> + +extern struct of_device_id __timer_of_table[]; + +static const struct of_device_id __timer_of_table_sentinel + __used __section(__timer_of_table_end); + +void __init timer_probe(void) +{ + struct device_node *np; + const struct of_device_id *match; + of_init_fn_1_ret init_func_ret; + unsigned timers = 0; + int ret; + + for_each_matching_node_and_match(np, __timer_of_table, &match) { + if (!of_device_is_available(np)) + continue; + + init_func_ret = match->data; + + ret = init_func_ret(np); + if (ret) { + pr_err("Failed to initialize '%s': %d\n", + of_node_full_name(np), ret); + continue; + } + + timers++; + } + + timers += acpi_probe_device_table(timer); + + if (!timers) + pr_crit("%s: no matching timers found\n", __func__); +} diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index ca922ae..79d5443 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -172,7 +172,7 @@ KEEP(*(__##name##_of_table)) \ KEEP(*(__##name##_of_table_end)) -#define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer) +#define TIMER_OF_TABLES() OF_TABLE(CONFIG_TIMER_OF, timer) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 7cd38b2..c48ceef 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -252,7 +252,7 @@ extern int clocksource_i8253_init(void); #define TIMER_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1_RET(timer, name, compat, fn) -#ifdef CONFIG_CLKSRC_PROBE +#ifdef CONFIG_TIMER_PROBE extern void timer_probe(void); #else static inline void timer_probe(void) {} -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF 2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano @ 2017-05-28 3:00 ` Shawn Guo 2017-05-28 9:18 ` Daniel Lezcano 2017-05-28 13:52 ` Linus Walleij 2017-05-31 8:24 ` Krzysztof Kozlowski 2 siblings, 1 reply; 19+ messages in thread From: Shawn Guo @ 2017-05-28 3:00 UTC (permalink / raw) To: Daniel Lezcano Cc: tglx, linux-arm-kernel, linux-kernel, Russell King, Florian Fainelli, Ray Jui, Scott Branden, maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..., Alexander Shiyan, Sascha Hauer, Fabio Estevam, Kukjin Kim, Krzysztof Kozlowski, Javier Martinez Canillas, Catalin Marinas, Will Deacon, Yoshinori Sato, Michal Simek, John Crispin On Sat, May 27, 2017 at 11:58:47AM +0200, Daniel Lezcano wrote: > diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c > index fb9a73a..4a4d2e2 100644 > --- a/arch/arm/mach-imx/epit.c > +++ b/arch/arm/mach-imx/epit.c > @@ -39,7 +39,7 @@ > #define EPITCR_OM_TOGGLE (1 << 22) > #define EPITCR_OM_CLEAR (2 << 22) > #define EPITCR_OM_SET (3 << 22) > -#define EPITCR_CLKSRC_OFF (0 << 24) > +#define EPITCR_TIMER_OFF (0 << 24) > #define EPITCR_CLKSRC_PERIPHERAL (1 << 24) > #define EPITCR_CLKSRC_REF_HIGH (1 << 24) > #define EPITCR_CLKSRC_REF_LOW (3 << 24) I do not think this change should be there. Shawn ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF 2017-05-28 3:00 ` Shawn Guo @ 2017-05-28 9:18 ` Daniel Lezcano 0 siblings, 0 replies; 19+ messages in thread From: Daniel Lezcano @ 2017-05-28 9:18 UTC (permalink / raw) To: Shawn Guo Cc: tglx, linux-arm-kernel, linux-kernel, Russell King, Florian Fainelli, Ray Jui, Scott Branden, maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..., Alexander Shiyan, Sascha Hauer, Fabio Estevam, Kukjin Kim, Krzysztof Kozlowski, Javier Martinez Canillas, Catalin Marinas, Will Deacon, Yoshinori Sato, Michal Simek, John Crispin On 28/05/2017 05:00, Shawn Guo wrote: > On Sat, May 27, 2017 at 11:58:47AM +0200, Daniel Lezcano wrote: >> diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c >> index fb9a73a..4a4d2e2 100644 >> --- a/arch/arm/mach-imx/epit.c >> +++ b/arch/arm/mach-imx/epit.c >> @@ -39,7 +39,7 @@ >> #define EPITCR_OM_TOGGLE (1 << 22) >> #define EPITCR_OM_CLEAR (2 << 22) >> #define EPITCR_OM_SET (3 << 22) >> -#define EPITCR_CLKSRC_OFF (0 << 24) >> +#define EPITCR_TIMER_OFF (0 << 24) >> #define EPITCR_CLKSRC_PERIPHERAL (1 << 24) >> #define EPITCR_CLKSRC_REF_HIGH (1 << 24) >> #define EPITCR_CLKSRC_REF_LOW (3 << 24) > > I do not think this change should be there. Right. Thanks! -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF 2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano 2017-05-28 3:00 ` Shawn Guo @ 2017-05-28 13:52 ` Linus Walleij 2017-05-31 8:24 ` Krzysztof Kozlowski 2 siblings, 0 replies; 19+ messages in thread From: Linus Walleij @ 2017-05-28 13:52 UTC (permalink / raw) To: Daniel Lezcano Cc: Thomas Gleixner, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King, Florian Fainelli, Ray Jui, Scott Branden, maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..., Alexander Shiyan, Shawn Guo, Sascha Hauer, Fabio Estevam, Kukjin Kim, Krzysztof Kozlowski, Javier Martinez Canillas, Catalin Marinas, Will On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > The config option name is now renamed to 'TIMER_OF' for consistency with > the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> After fixing the offset thing found by Shawn: Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF 2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano 2017-05-28 3:00 ` Shawn Guo 2017-05-28 13:52 ` Linus Walleij @ 2017-05-31 8:24 ` Krzysztof Kozlowski 2 siblings, 0 replies; 19+ messages in thread From: Krzysztof Kozlowski @ 2017-05-31 8:24 UTC (permalink / raw) To: Daniel Lezcano Cc: tglx, linux-arm-kernel, linux-kernel, Russell King, Florian Fainelli, Ray Jui, Scott Branden, maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..., Alexander Shiyan, Shawn Guo, Sascha Hauer, Fabio Estevam, Kukjin Kim, Javier Martinez Canillas, Catalin Marinas, Will Deacon, Yoshinori Sato, Michal Simek, John Crispin On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > The config option name is now renamed to 'TIMER_OF' for consistency with > the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > arch/arm/Kconfig | 10 +++--- > arch/arm/mach-bcm/Kconfig | 2 +- > arch/arm/mach-clps711x/Kconfig | 2 +- > arch/arm/mach-imx/epit.c | 2 +- > arch/arm/mach-s3c24xx/Kconfig | 2 +- > arch/arm/mach-s3c64xx/Kconfig | 2 +- > arch/arm64/Kconfig.platforms | 4 +-- > arch/h8300/Kconfig | 2 +- > arch/microblaze/Kconfig | 2 +- > arch/mips/ralink/Kconfig | 2 +- > arch/nios2/Kconfig | 2 +- > arch/sh/boards/Kconfig | 2 +- > drivers/clocksource/Kconfig | 60 ++++++++++++++++----------------- > drivers/clocksource/Makefile | 2 +- > drivers/clocksource/clksrc-probe.c | 55 ------------------------------ > drivers/clocksource/clps711x-timer.c | 2 +- > drivers/clocksource/samsung_pwm_timer.c | 2 +- For s3c24xx, s3c64xx and samsung_pwm_timer: Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2017-05-31 8:24 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org>
2017-05-27 9:58 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Daniel Lezcano
2017-05-28 13:48 ` Linus Walleij
2017-05-28 14:20 ` Daniel Lezcano
2017-05-29 7:39 ` Heiko Stübner
2017-05-29 8:00 ` Neil Armstrong
2017-05-29 8:41 ` Arnd Bergmann
[not found] ` <CAK8P3a3QACHYqtCO1z_FpW0nXEtx356wCDha_=SNXU872=q1UQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-29 8:48 ` Daniel Lezcano
2017-05-29 9:57 ` Arnd Bergmann
[not found] ` <CAK8P3a1Kv_RhKL43ie6co_N5pDXvRHd7Uq8g70qt80WkxuhzLw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-29 10:55 ` Daniel Lezcano
2017-05-29 11:21 ` Arnd Bergmann
[not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-05-29 13:25 ` Matthias Brugger
2017-05-31 8:19 ` Krzysztof Kozlowski
2017-05-30 16:36 ` Vineet Gupta
2017-05-31 7:11 ` Patrice CHOTARD
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
2017-05-28 3:00 ` Shawn Guo
2017-05-28 9:18 ` Daniel Lezcano
2017-05-28 13:52 ` Linus Walleij
2017-05-31 8:24 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).