aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>2012-09-14 00:27:13 -0400
committerSimon Horman <horms@verge.net.au>2012-11-05 23:47:24 -0500
commit86bc52ef4373be64867b56f3a9e30cbabf64e0dd (patch)
treee8987e7fe0728685041f58bb062eb4ad1c33088e
parent40eaed7f7be18a53f9267d336d37f1e13b3a7f93 (diff)
ARM: shmobile: r8a7740: Enable PMU
This patch enables PMU for r8a7740. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> [horms@verge.net.au: corrected indentation] Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--arch/arm/configs/armadillo800eva_defconfig1
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7740.c16
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index f78d259f8d23..3d764072dd54 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT=16
7# CONFIG_IPC_NS is not set 7# CONFIG_IPC_NS is not set
8# CONFIG_PID_NS is not set 8# CONFIG_PID_NS is not set
9CONFIG_CC_OPTIMIZE_FOR_SIZE=y 9CONFIG_CC_OPTIMIZE_FOR_SIZE=y
10CONFIG_PERF_EVENTS=y
10CONFIG_SLAB=y 11CONFIG_SLAB=y
11CONFIG_MODULES=y 12CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 9777e2daffd2..6ac242cdca7f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -590,6 +590,21 @@ static struct platform_device i2c1_device = {
590 .num_resources = ARRAY_SIZE(i2c1_resources), 590 .num_resources = ARRAY_SIZE(i2c1_resources),
591}; 591};
592 592
593static struct resource pmu_resources[] = {
594 [0] = {
595 .start = evt2irq(0x19a0),
596 .end = evt2irq(0x19a0),
597 .flags = IORESOURCE_IRQ,
598 },
599};
600
601static struct platform_device pmu_device = {
602 .name = "arm-pmu",
603 .id = -1,
604 .num_resources = ARRAY_SIZE(pmu_resources),
605 .resource = pmu_resources,
606};
607
593static struct platform_device *r8a7740_late_devices[] __initdata = { 608static struct platform_device *r8a7740_late_devices[] __initdata = {
594 &i2c0_device, 609 &i2c0_device,
595 &i2c1_device, 610 &i2c1_device,
@@ -597,6 +612,7 @@ static struct platform_device *r8a7740_late_devices[] __initdata = {
597 &dma1_device, 612 &dma1_device,
598 &dma2_device, 613 &dma2_device,
599 &usb_dma_device, 614 &usb_dma_device,
615 &pmu_device,
600}; 616};
601 617
602/* 618/*