| Message ID | 1416397800-12457-5-git-send-email-mark.rutland@arm.com |
|---|---|
| State | Accepted |
| Commit | b22a75cf9d9dfc0193fbd1251acf1925872a5be3 |
| Headers | show |
On Wed, Nov 19, 2014 at 12:49 PM, Mark Rutland <mark.rutland@arm.com> wrote: > Now that we can specify which PMU variant we're likely to deal with, do > so in the iop board code. This will allow us to split the ARMv6, ARMv7, > and XScale PMU drivers. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Olof Johansson <olof@lixom.net> > Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/arch/arm/plat-iop/pmu.c b/arch/arm/plat-iop/pmu.c index ad9f974..c6d979a 100644 --- a/arch/arm/plat-iop/pmu.c +++ b/arch/arm/plat-iop/pmu.c @@ -24,7 +24,7 @@ static struct resource pmu_resource = { }; static struct platform_device pmu_device = { - .name = "arm-pmu", + .name = "xscale-pmu", .id = -1, .resource = &pmu_resource, .num_resources = 1,
Now that we can specify which PMU variant we're likely to deal with, do so in the iop board code. This will allow us to split the ARMv6, ARMv7, and XScale PMU drivers. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> --- arch/arm/plat-iop/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)