]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform
authorMagnus Damm <damm+renesas@opensource.se>
Tue, 16 Dec 2014 09:39:31 +0000 (18:39 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Sun, 21 Dec 2014 08:11:20 +0000 (17:11 +0900)
Skip the TWD setup in C for r8a7779 Multiplatform.
We should use DTS for the TWD device anyway.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/smp-r8a7779.c

index 3f761f8390430d61fa7753511412d06827eaf284..9fc280e24ef49cfa5c7892be1bcceb5ef4879d4a 100644 (file)
@@ -56,7 +56,7 @@ static struct rcar_sysc_ch *r8a7779_ch_cpu[4] = {
        [3] = &r8a7779_ch_cpu3,
 };
 
-#ifdef CONFIG_HAVE_ARM_TWD
+#if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM)
 static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29);
 void __init r8a7779_register_twd(void)
 {