summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2010-04-09 13:55:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-04-29 18:03:22 +0100
commit8716011315a5b2fa932fa1e7570c34975ed2cb14 (patch)
tree4ccd9cd93710402f55407fa1368cba19600c2bc6 /arch/arm
parent28d7f4ec98a8edb029ef24c1ee4af6a1ccbc9633 (diff)
downloadblackbird-op-linux-8716011315a5b2fa932fa1e7570c34975ed2cb14.tar.gz
blackbird-op-linux-8716011315a5b2fa932fa1e7570c34975ed2cb14.zip
ARM: 6047/1: ARM: BCMRING: register PMU IRQ during board initialisation
This patch updates the initialisation routine for the BCMRING platform so that it registers its PMU IRQ with the PMU framework in the Kernel. Acked-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-bcmring/arch.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index 53dd2a9eecf9..2f139196d63d 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -29,6 +29,7 @@
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/time.h>
+#include <asm/pmu.h>
#include <asm/mach/arch.h>
#include <mach/dma.h>
@@ -85,8 +86,23 @@ static struct platform_device nand_device = {
.num_resources = ARRAY_SIZE(nand_resource),
};
+static struct resource pmu_resource = {
+ .start = IRQ_PMUIRQ,
+ .end = IRQ_PMUIRQ,
+ .flags = IORESOURCE_IRQ,
+};
+
+static struct platform_device pmu_device = {
+ .name = "arm-pmu",
+ .id = ARM_PMU_DEVICE_CPU,
+ .resource = &pmu_resource,
+ .num_resources = 1,
+};
+
+
static struct platform_device *devices[] __initdata = {
&nand_device,
+ &pmu_device,
};
/****************************************************************************
OpenPOWER on IntegriCloud