ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
Since commit e042681894
("ARM: shmobile: r8a7790: Remove legacy
code"), all R-Car Gen2 SoCs are supported by multiplatform kernels only.
As CONFIG_COMMON_CLK is always set for multiplatform kernels, we can
remove related #ifdefs in code specific to R-Car Gen2 SoCs.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Родитель
e2fd51b7e1
Коммит
8883e72da3
|
@ -50,9 +50,7 @@ u32 rcar_gen2_read_mode_pins(void)
|
|||
|
||||
void __init rcar_gen2_timer_init(void)
|
||||
{
|
||||
#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK)
|
||||
u32 mode = rcar_gen2_read_mode_pins();
|
||||
#endif
|
||||
#ifdef CONFIG_ARM_ARCH_TIMER
|
||||
void __iomem *base;
|
||||
int extal_mhz = 0;
|
||||
|
@ -128,9 +126,7 @@ void __init rcar_gen2_timer_init(void)
|
|||
iounmap(base);
|
||||
#endif /* CONFIG_ARM_ARCH_TIMER */
|
||||
|
||||
#ifdef CONFIG_COMMON_CLK
|
||||
rcar_gen2_clocks_init(mode);
|
||||
#endif
|
||||
#ifdef CONFIG_ARCH_SHMOBILE_MULTI
|
||||
clocksource_of_init();
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче