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

Commit 073b6ff3 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

RealView: Move the EB GIC definitions to the board file 



This is in preparation for the RealView PB11MPCore and PB1176 patches
which have different base addresses for the GIC.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent be4f3c86

arch/arm/mach-realview/realview_eb.c

+8 −8
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ static struct map_desc realview_eb_io_desc[] __initdata = { 
		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_GIC_CPU_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_GIC_CPU_BASE),

		.virtual	= IO_ADDRESS(REALVIEW_EB_GIC_CPU_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_EB_GIC_CPU_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_GIC_DIST_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_GIC_DIST_BASE),

		.virtual	= IO_ADDRESS(REALVIEW_EB_GIC_DIST_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_EB_GIC_DIST_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {
@@ -286,14 +286,14 @@ static void __init gic_init_irq(void) 


#ifndef CONFIG_REALVIEW_EB_ARM11MP_REVB

		/* board GIC, secondary */

		gic_dist_init(1, __io_address(REALVIEW_GIC_DIST_BASE), 64);

		gic_cpu_init(1, __io_address(REALVIEW_GIC_CPU_BASE));

		gic_dist_init(1, __io_address(REALVIEW_EB_GIC_DIST_BASE), 64);

		gic_cpu_init(1, __io_address(REALVIEW_EB_GIC_CPU_BASE));

		gic_cascade_irq(1, IRQ_EB11MP_EB_IRQ1);

#endif

	} else {

		/* board GIC, primary */

		gic_cpu_base_addr = __io_address(REALVIEW_GIC_CPU_BASE);

		gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29);

		gic_cpu_base_addr = __io_address(REALVIEW_EB_GIC_CPU_BASE);

		gic_dist_init(0, __io_address(REALVIEW_EB_GIC_DIST_BASE), 29);

		gic_cpu_init(0, gic_cpu_base_addr);

	}

}

include/asm-arm/arch-realview/board-eb.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
/*

 * RealView EB + ARM11MPCore peripheral addresses

 */

#define REALVIEW_EB_GIC_CPU_BASE	0x10040000	/* Generic interrupt controller CPU interface */

#define REALVIEW_EB_GIC_DIST_BASE	0x10041000	/* Generic interrupt controller distributor */



#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB

#define REALVIEW_EB11MP_SCU_BASE	0x10100000	/* SCU registers */

#define REALVIEW_EB11MP_GIC_CPU_BASE	0x10100100	/* Generic interrupt controller CPU interface */

include/asm-arm/arch-realview/platform.h

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ 
	/* Reserved 0x1001A000 - 0x1001FFFF */

#define REALVIEW_CLCD_BASE            0x10020000	/* CLCD */

#define REALVIEW_DMAC_BASE            0x10030000	/* DMA controller */

#define REALVIEW_GIC_CPU_BASE         0x10040000	/* Generic interrupt controller CPU interface */

#define REALVIEW_GIC_DIST_BASE        0x10041000	/* Generic interrupt controller distributor */

#define REALVIEW_SMC_BASE             0x10080000	/* SMC */

	/* Reserved 0x10090000 - 0x100EFFFF */