Skip to contentSkip to conversation

ARM: shmobile: r8a7779: Remove legacy SoC code

PATCH In review Magnus Damm 2 participants 2 messages Jul 16, 2015

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 2/3 ARM: shmobile: r8a7779: Remove legacy SoC code

From: Magnus Damm <[email protected]>

Now when the Marzen legacy board code is gone this patch removes the unused r8a7779 legacy SoC code.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/Makefile        |    1 
 arch/arm/mach-shmobile/clock-r8a7779.c |  271 ------------
 arch/arm/mach-shmobile/r8a7779.h       |   17 
 arch/arm/mach-shmobile/setup-r8a7779.c |  676 --------------------------------
 arch/arm/mach-shmobile/smp-r8a7779.c   |    9 
 5 files changed, 4 insertions(+), 970 deletions(-)
arch/arm/mach-shmobile/Makefile +0 -1
@@ -22,7 +22,6 @@ obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s
 ifndef CONFIG_COMMON_CLK
 obj-y				+= clock.o
 obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o
 endif
 
 # CPU reset vector handling objects
arch/arm/mach-shmobile/clock-r8a7779.c deleted +0 -271

271 lines not on this page · raw message

arch/arm/mach-shmobile/r8a7779.h +0 -17
@@ -3,24 +3,7 @@
 
 #include <linux/sh_clk.h>
 
-/* HPB-DMA slave IDs */
-enum {
-	HPBDMA_SLAVE_DUMMY,
-	HPBDMA_SLAVE_SDHI0_TX,
-	HPBDMA_SLAVE_SDHI0_RX,
-};
-
-extern void r8a7779_init_irq_extpin(int irlm);
-extern void r8a7779_init_irq_dt(void);
-extern void r8a7779_map_io(void);
-extern void r8a7779_earlytimer_init(void);
-extern void r8a7779_add_early_devices(void);
-extern void r8a7779_add_standard_devices(void);
-extern void r8a7779_init_late(void);
-extern u32 r8a7779_read_mode_pins(void);
-extern void r8a7779_pinmux_init(void);
 extern void r8a7779_pm_init(void);
-extern void r8a7779_register_twd(void);
 
 #ifdef CONFIG_PM
 extern void __init r8a7779_init_pm_domains(void);
arch/arm/mach-shmobile/setup-r8a7779.c +4 -672

722 lines not on this page · raw message

arch/arm/mach-shmobile/smp-r8a7779.c +0 -9
@@ -23,7 +23,6 @@
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
-#include <asm/smp_twd.h>
 
 #include "common.h"
 #include "pm-rcar.h"

@@ -56,14 +55,6 @@ static const struct rcar_sysc_ch * const
 	[3] = &r8a7779_ch_cpu3,
 };
 
-#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)
-{
-	twd_local_timer_register(&twd_local_timer);
-}
-#endif
-
 static int r8a7779_platform_cpu_kill(unsigned int cpu)
 {
 	const struct rcar_sysc_ch *ch = NULL;
Acked-by on v1 2/3
#1 lore raw
Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Now when the Marzen legacy board code is gone this patch removes the unused r8a7779 legacy SoC code.

Signed-off-by Magnus Damm <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds