SUPERH platform development
 help / color / mirror / Atom feed
* [PATCH] ARM: shmobile: rcar-gen2: CONFIG_ARM_ARCH_TIMER is always set
@ 2015-07-07 14:05 Geert Uytterhoeven
  2015-07-07 15:17 ` Magnus Damm
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2015-07-07 14:05 UTC (permalink / raw)
  To: linux-sh

Since commit 731bde02f622d694 ("ARM: shmobile: Select
HAVE_ARM_ARCH_TIMER from Kconfig"), CONFIG_ARM_ARCH_TIMER is always set
when building for R-Car Gen2 SoCs, as it is selected by
CONFIG_HAVE_ARM_ARCH_TIMER.  Remove the obsolete #ifdef testing for it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index aa3339258d9c0232..570d6bd3784f7464 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -52,7 +52,6 @@ u32 rcar_gen2_read_mode_pins(void)
 void __init rcar_gen2_timer_init(void)
 {
 	u32 mode = rcar_gen2_read_mode_pins();
-#ifdef CONFIG_ARM_ARCH_TIMER
 	void __iomem *base;
 	int extal_mhz = 0;
 	u32 freq;
@@ -125,7 +124,6 @@ void __init rcar_gen2_timer_init(void)
 	}
 
 	iounmap(base);
-#endif /* CONFIG_ARM_ARCH_TIMER */
 
 	rcar_gen2_clocks_init(mode);
 	clocksource_of_init();
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2015-07-14 10:28 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-07 14:05 [PATCH] ARM: shmobile: rcar-gen2: CONFIG_ARM_ARCH_TIMER is always set Geert Uytterhoeven
2015-07-07 15:17 ` Magnus Damm
2015-07-07 15:21 ` Geert Uytterhoeven
2015-07-07 15:34 ` Magnus Damm
2015-07-08  1:16 ` Simon Horman
2015-07-08  1:40 ` Magnus Damm
2015-07-08  2:05 ` Simon Horman
2015-07-08  6:56 ` Geert Uytterhoeven
2015-07-10  4:26 ` Simon Horman
2015-07-13  1:23 ` Simon Horman
2015-07-13  5:20 ` Magnus Damm
2015-07-14 10:28 ` Magnus Damm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox