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

Commit f417cbad authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 6057/1: Realview: register PMU IRQs during board initialisation 



This patch updates the initialisation routines for the Realview boards
and the Versatile Express board [ca9x4 tile] so that they register their
PMU IRQs with the PMU framework in the Kernel.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 59ac59f6

arch/arm/mach-realview/realview_eb.c

+32 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/localtimer.h>
@@ -292,6 +293,36 @@ static struct resource realview_eb_isp1761_resources[] = { 
	},

};



static struct resource pmu_resources[] = {

	[0] = {

		.start		= IRQ_EB11MP_PMU_CPU0,

		.end		= IRQ_EB11MP_PMU_CPU0,

		.flags		= IORESOURCE_IRQ,

	},

	[1] = {

		.start		= IRQ_EB11MP_PMU_CPU1,

		.end		= IRQ_EB11MP_PMU_CPU1,

		.flags		= IORESOURCE_IRQ,

	},

	[2] = {

		.start		= IRQ_EB11MP_PMU_CPU2,

		.end		= IRQ_EB11MP_PMU_CPU2,

		.flags		= IORESOURCE_IRQ,

	},

	[3] = {

		.start		= IRQ_EB11MP_PMU_CPU3,

		.end		= IRQ_EB11MP_PMU_CPU3,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.num_resources		= ARRAY_SIZE(pmu_resources),

	.resource		= pmu_resources,

};



static void __init gic_init_irq(void)

{

	if (core_tile_eb11mp() || core_tile_a9mp()) {
@@ -405,6 +436,7 @@ static void __init realview_eb_init(void) 
		 * Bits:  .... ...0 0111 1001 0000 .... .... .... */

		l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);

#endif

		platform_device_register(&pmu_device);

	}



	realview_flash_register(&realview_eb_flash_resource, 1);

arch/arm/mach-realview/realview_pb1176.c

+15 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>
@@ -261,6 +262,19 @@ static struct resource realview_pb1176_isp1761_resources[] = { 
	},

};



static struct resource pmu_resource = {

	.start		= IRQ_DC1176_CORE_PMU,

	.end		= IRQ_DC1176_CORE_PMU,

	.flags		= IORESOURCE_IRQ,

};



static struct platform_device pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.num_resources		= 1,

	.resource		= &pmu_resource,

};



static void __init gic_init_irq(void)

{

	/* ARM1176 DevChip GIC, primary */
@@ -322,6 +336,7 @@ static void __init realview_pb1176_init(void) 
	realview_eth_register(NULL, realview_pb1176_smsc911x_resources);

	platform_device_register(&realview_i2c_device);

	realview_usb_register(realview_pb1176_isp1761_resources);

	platform_device_register(&pmu_device);



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

arch/arm/mach-realview/realview_pb11mp.c

+32 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/localtimer.h>
@@ -258,6 +259,36 @@ static struct resource realview_pb11mp_isp1761_resources[] = { 
	},

};



static struct resource pmu_resources[] = {

	[0] = {

		.start		= IRQ_TC11MP_PMU_CPU0,

		.end		= IRQ_TC11MP_PMU_CPU0,

		.flags		= IORESOURCE_IRQ,

	},

	[1] = {

		.start		= IRQ_TC11MP_PMU_CPU1,

		.end		= IRQ_TC11MP_PMU_CPU1,

		.flags		= IORESOURCE_IRQ,

	},

	[2] = {

		.start		= IRQ_TC11MP_PMU_CPU2,

		.end		= IRQ_TC11MP_PMU_CPU2,

		.flags		= IORESOURCE_IRQ,

	},

	[3] = {

		.start		= IRQ_TC11MP_PMU_CPU3,

		.end		= IRQ_TC11MP_PMU_CPU3,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.num_resources		= ARRAY_SIZE(pmu_resources),

	.resource		= pmu_resources,

};



static void __init gic_init_irq(void)

{

	unsigned int pldctrl;
@@ -327,6 +358,7 @@ static void __init realview_pb11mp_init(void) 
	platform_device_register(&realview_i2c_device);

	platform_device_register(&realview_cf_device);

	realview_usb_register(realview_pb11mp_isp1761_resources);

	platform_device_register(&pmu_device);



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

arch/arm/mach-realview/realview_pba8.c

+15 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/hardware/gic.h>



#include <asm/mach/arch.h>
@@ -248,6 +249,19 @@ static struct resource realview_pba8_isp1761_resources[] = { 
	},

};



static struct resource pmu_resource = {

	.start		= IRQ_PBA8_PMU,

	.end		= IRQ_PBA8_PMU,

	.flags		= IORESOURCE_IRQ,

};



static struct platform_device pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.num_resources		= 1,

	.resource		= &pmu_resource,

};



static void __init gic_init_irq(void)

{

	/* ARM PB-A8 on-board GIC */
@@ -294,6 +308,7 @@ static void __init realview_pba8_init(void) 
	platform_device_register(&realview_i2c_device);

	platform_device_register(&realview_cf_device);

	realview_usb_register(realview_pba8_isp1761_resources);

	platform_device_register(&pmu_device);



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

arch/arm/mach-realview/realview_pbx.c

+32 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/smp_twd.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>
@@ -270,6 +271,36 @@ static struct resource realview_pbx_isp1761_resources[] = { 
	},

};



static struct resource pmu_resources[] = {

	[0] = {

		.start		= IRQ_PBX_PMU_CPU0,

		.end		= IRQ_PBX_PMU_CPU0,

		.flags		= IORESOURCE_IRQ,

	},

	[1] = {

		.start		= IRQ_PBX_PMU_CPU1,

		.end		= IRQ_PBX_PMU_CPU1,

		.flags		= IORESOURCE_IRQ,

	},

	[2] = {

		.start		= IRQ_PBX_PMU_CPU2,

		.end		= IRQ_PBX_PMU_CPU2,

		.flags		= IORESOURCE_IRQ,

	},

	[3] = {

		.start		= IRQ_PBX_PMU_CPU3,

		.end		= IRQ_PBX_PMU_CPU3,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.num_resources		= ARRAY_SIZE(pmu_resources),

	.resource		= pmu_resources,

};



static void __init gic_init_irq(void)

{

	/* ARM PBX on-board GIC */
@@ -354,6 +385,7 @@ static void __init realview_pbx_init(void) 
		/* 16KB way size, 8-way associativity, parity disabled

		 * Bits:  .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */

		l2x0_init(l2x0_base, 0x02520000, 0xc0000fff);

		platform_device_register(&pmu_device);

	}

#endif