Skip to content

Commit 6008306

Browse files
geertumpe
authored andcommitted
powerpc/time: Replace <linux/clk-provider.h> by <linux/of_clk.h>
The PowerPC time code is not a clock provider, and just needs to call of_clk_init(). Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>. Remove the #ifdef protecting the of_clk_init() call, as a stub is available for the !CONFIG_COMMON_CLK case. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 54fc3c6 commit 6008306

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/powerpc/kernel/time.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include <linux/irq.h>
5151
#include <linux/delay.h>
5252
#include <linux/irq_work.h>
53-
#include <linux/clk-provider.h>
53+
#include <linux/of_clk.h>
5454
#include <linux/suspend.h>
5555
#include <linux/sched/cputime.h>
5656
#include <linux/processor.h>
@@ -1149,9 +1149,7 @@ void __init time_init(void)
11491149
init_decrementer_clockevent();
11501150
tick_setup_hrtimer_broadcast();
11511151

1152-
#ifdef CONFIG_COMMON_CLK
11531152
of_clk_init(NULL);
1154-
#endif
11551153
}
11561154

11571155
/*

0 commit comments

Comments
 (0)