Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177cf6e5 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

clocksources: Switch back to the clksrc table 



All the clocksource drivers's init function are now converted to return
an error code. CLOCKSOURCE_OF_DECLARE is no longer used as well as the
clksrc-of table.

Let's convert back the names:
 - CLOCKSOURCE_OF_DECLARE_RET => CLOCKSOURCE_OF_DECLARE
 - clksrc-of-ret              => clksrc-of

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>

For exynos_mct and samsung_pwm_timer:
Acked-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>

For arch/arc:
Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>

For mediatek driver:
Acked-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>

For the Rockchip-part
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>

For STi :
Acked-by: default avatarPatrice Chotard <patrice.chotard@st.com>

For the mps2-timer.c and versatile.c changes:
Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>

For the OXNAS part :
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>

For LPC32xx driver:
Acked-by: default avatarSylvain Lemieux <slemieux.tyco@gmail.com>

For Broadcom Kona timer change:
Acked-by: default avatarRay Jui <ray.jui@broadcom.com>

For Sun4i and Sun5i:
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>

For Meson6:
Acked-by: default avatarCarlo Caione <carlo@caione.org>

For Keystone:
Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>

For NPS:
Acked-by: default avatarNoam Camus <noamca@mellanox.com>

For bcm2835:
Acked-by: default avatarEric Anholt <eric@anholt.net>
parent 8595b1ba

arch/arc/kernel/time.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ static int __init arc_cs_setup_gfrc(struct device_node *node) 




	return clocksource_register_hz(&arc_counter_gfrc, arc_timer_freq);

	return clocksource_register_hz(&arc_counter_gfrc, arc_timer_freq);

}

}

CLOCKSOURCE_OF_DECLARE_RET(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);

CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);





#endif

#endif
@@ -192,7 +192,7 @@ static int __init arc_cs_setup_rtc(struct device_node *node) 




	return clocksource_register_hz(&arc_counter_rtc, arc_timer_freq);

	return clocksource_register_hz(&arc_counter_rtc, arc_timer_freq);

}

}

CLOCKSOURCE_OF_DECLARE_RET(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);

CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);





#endif

#endif
@@ -379,7 +379,7 @@ static int __init arc_of_timer_init(struct device_node *np) 




	return ret;

	return ret;

}

}

CLOCKSOURCE_OF_DECLARE_RET(arc_clkevt, "snps,arc-timer", arc_of_timer_init);

CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init);





/*

/*

 * Called from start_kernel() - boot CPU only

 * Called from start_kernel() - boot CPU only

arch/arm/kernel/smp_twd.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ static int __init twd_local_timer_of_register(struct device_node *np) 
	WARN(err, "twd_local_timer_of_register failed (%d)\n", err);

	WARN(err, "twd_local_timer_of_register failed (%d)\n", err);

	return err;

	return err;

}

}

CLOCKSOURCE_OF_DECLARE_RET(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register);

CLOCKSOURCE_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register);

CLOCKSOURCE_OF_DECLARE_RET(arm_twd_a5, "arm,cortex-a5-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_RET(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register);

CLOCKSOURCE_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register);

#endif
 
#endif

arch/microblaze/kernel/timer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -332,5 +332,5 @@ static int __init xilinx_timer_init(struct device_node *timer) 
	return 0;

	return 0;

}

}





CLOCKSOURCE_OF_DECLARE_RET(xilinx_timer, "xlnx,xps-timer-1.00.a",

CLOCKSOURCE_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a",

		       xilinx_timer_init);
 
		       xilinx_timer_init);

arch/mips/ralink/cevt-rt3352.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,4 +150,4 @@ static int __init ralink_systick_init(struct device_node *np) 
	return 0;

	return 0;

}

}





CLOCKSOURCE_OF_DECLARE_RET(systick, "ralink,cevt-systick", ralink_systick_init);
 
CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init);

arch/nios2/kernel/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -352,4 +352,4 @@ void __init time_init(void) 
	clocksource_probe();

	clocksource_probe();

}

}





CLOCKSOURCE_OF_DECLARE_RET(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
 
CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);