summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2014-05-23 14:51:50 +0100
committerOlof Johansson <olof@lixom.net>2015-02-06 00:13:01 -0800
commit744503b35a467ca89546906dba16d30de8d3b171 (patch)
treee51e9f3105d3803ac3ee68aa8b56999f8f0336da /arch/arm/mach-shmobile
parentb22a75cf9d9dfc0193fbd1251acf1925872a5be3 (diff)
downloadop-kernel-dev-744503b35a467ca89546906dba16d30de8d3b171.zip
op-kernel-dev-744503b35a467ca89546906dba16d30de8d3b171.tar.gz
arm: shmobile: specify PMUs are for ARMv7 CPUs
Now that we can specify which PMU variant we're likely to deal with, do so in the shmobile board code. This will allow us to split the ARMv6, ARMv7, and XScale PMU drivers Signed-off-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Simon Horman <horms+renesas@verge.net.au> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Magnus Damm <magnus.damm@gmail.com> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7740.c2
-rw-r--r--arch/arm/mach-shmobile/setup-sh73a0.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 79ad93d..6edde2f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -656,7 +656,7 @@ static struct resource pmu_resources[] = {
};
static struct platform_device pmu_device = {
- .name = "arm-pmu",
+ .name = "armv7-pmu",
.id = -1,
.num_resources = ARRAY_SIZE(pmu_resources),
.resource = pmu_resources,
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 93ebe34..bdfa7a5 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -563,7 +563,7 @@ static struct resource pmu_resources[] = {
};
static struct platform_device pmu_device = {
- .name = "arm-pmu",
+ .name = "armv7-pmu",
.id = -1,
.num_resources = ARRAY_SIZE(pmu_resources),
.resource = pmu_resources,
OpenPOWER on IntegriCloud