rk2928: register arm-pmu device

diff --git a/arch/arm/mach-rk2928/devices.c b/arch/arm/mach-rk2928/devices.c
index 1dc4df27e90bcf1cee92ac830c39c518834b6f3b..0e2c3290cd3004f23c96fd32a2b677227760ee4f 100755 (executable)
--- a/arch/arm/mach-rk2928/devices.c
+++ b/arch/arm/mach-rk2928/devices.c
@@ -779,6 +779,19 @@ static struct platform_device device_acodec = {
 };
 #endif
 
+static struct resource resource_arm_pmu = {
+       .start          = IRQ_ARM_PMU,
+       .end            = IRQ_ARM_PMU,
+       .flags          = IORESOURCE_IRQ,
+};
+
+struct platform_device device_arm_pmu = {
+       .name           = "arm-pmu",
+       .id             = ARM_PMU_DEVICE_CPU,
+       .num_resources  = 1,
+       .resource       = &resource_arm_pmu,
+};
+
 static int __init rk2928_init_devices(void)
 {
        rk2928_init_dma();
@@ -817,6 +830,7 @@ static int __init rk2928_init_devices(void)
 #ifdef CONFIG_HDMI_RK2928
        platform_device_register(&device_hdmi);
 #endif
+       platform_device_register(&device_arm_pmu);
        return 0;
 }
 arch_initcall(rk2928_init_devices);

diff --git a/arch/arm/mach-rk2928/include/mach/irqs.h b/arch/arm/mach-rk2928/include/mach/irqs.h
index d0d398074bac4e16ab04fef05d160e4e55326a93..1a7d885c128ec9e02f7dbba26ff08d1be6c72a20 100644 (file)
--- a/arch/arm/mach-rk2928/include/mach/irqs.h
+++ b/arch/arm/mach-rk2928/include/mach/irqs.h
@@ -53,7 +53,7 @@
 #define IRQ_SDMMC_DETECT                78
 #define IRQ_SDIO_DETECT                 79
 
-#define IRQ_ARM_PMU                     86
+#define IRQ_ARM_PMU                     118
 
 //hhb@rock-chips.com this spi is used for fiq_debugger signal irq
 #define IRQ_UART_SIGNAL                        127