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

Commit 8883e72d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set 



Since commit e0426818 ("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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent e2fd51b7

arch/arm/mach-shmobile/setup-rcar-gen2.c

+0 −4
Original line number Diff line number Diff line
@@ -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