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

Commit 23260e1b authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Use DT for GIC on EMEV2 and KZM9D 



Remove the C version of the EMEV2 GIC setup code,
instead rely on GIC information provided by DT.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 12d035b1

arch/arm/mach-shmobile/board-kzm9d.c

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d") 
	.smp		= smp_ops(emev2_smp_ops),

	.map_io		= emev2_map_io,

	.init_early	= emev2_init_delay,

	.nr_irqs	= NR_IRQS_LEGACY,

	.init_irq	= emev2_init_irq,

	.init_machine	= kzm9d_add_standard_devices,

	.init_late	= shmobile_init_late,

	.dt_compat	= kzm9d_boards_compat_dt,

arch/arm/mach-shmobile/include/mach/emev2.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define __ASM_EMEV2_H__



extern void emev2_map_io(void);

extern void emev2_init_irq(void);

extern void emev2_init_delay(void);

extern void emev2_add_standard_devices(void);

extern void emev2_clock_init(void);

arch/arm/mach-shmobile/setup-emev2.c

+0 −15
Original line number Diff line number Diff line
@@ -202,20 +202,6 @@ void __init emev2_init_delay(void) 
	shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */

}



void __init emev2_init_irq(void)

{

	void __iomem *gic_dist_base;

	void __iomem *gic_cpu_base;



	/* Static mappings, never released */

	gic_dist_base = ioremap(0xe0028000, PAGE_SIZE);

	gic_cpu_base = ioremap(0xe0020000, PAGE_SIZE);

	BUG_ON(!gic_dist_base || !gic_cpu_base);



	/* Use GIC to handle interrupts */

	gic_init(0, 29, gic_dist_base, gic_cpu_base);

}



#ifdef CONFIG_USE_OF



static const char *emev2_boards_compat_dt[] __initdata = {
@@ -226,7 +212,6 @@ static const char *emev2_boards_compat_dt[] __initdata = { 
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")

	.smp		= smp_ops(emev2_smp_ops),

	.init_early	= emev2_init_delay,

	.nr_irqs	= NR_IRQS_LEGACY,

	.dt_compat	= emev2_boards_compat_dt,

MACHINE_END