]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: 6047/1: ARM: BCMRING: register PMU IRQ during board initialisation
authorWill Deacon <will.deacon@arm.com>
Fri, 9 Apr 2010 12:55:54 +0000 (13:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Apr 2010 17:03:22 +0000 (18:03 +0100)
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>
arch/arm/mach-bcmring/arch.c

index 53dd2a9eecf9b1848d4d3514ebee97821bb7ada6..2f139196d63de611d4e00ff8d55e5994f375dcf4 100644 (file)
@@ -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,
 };
 
 /****************************************************************************