[PATCHv2 0/5] arm: specify PMU type in platform data

[PATCHv2 0/5] arm: specify PMU type in platform data

[Mark Rutland]

Currently the ARMv6, ARMv7, and XScale PMU drivers are coupled with each
other, and all included in the same c file. To enable the splitting of
the ARMv6, ARMv7, and XScale PMU drivers, and the conversion of the
arm_pmu framework to a pure library, we need to be a be more precise
when describing PMUs, to enable association of the PMU with the right
driver. In device tree this is already implicit in the compatible
string, but platform data currently only specifies "arm-pmu".

Commit 253d8c3d2518ca6f (arm: perf: add more specific platform device
IDs) added "armv6-pmu", "armv7-pmu", and "xscale-pmu" platform device
IDs, enabling the three to be distinguished. This series updates
platform code to use these strings.

A later patch series will decouple the drivers.

Since v1 [1]:
* Rebase to v3.19-rc4.
* Add Acks.
* Drop vexpress patches (platform code deleted).

Simon, in v1 you mentioned you were happy to take the shmobile patch
through your tree. Are you still happy to do so, or to give your ack
such that these can go through arm-soc together?

While I'm not too concerned which route these patches take, it would be
nice to have a single base for the patches splitting the drivers.

Thanks,
Mark.

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/304078.html

Mark Rutland (5):
  arm: realview: specify PMU types
  arm: pxa: specify PMUs are for XScale CPUs
  arm: iop: specify PMUs are for XScale CPUs
  arm: shmobile: specify PMUs are for ARMv7 CPUs
  arm: omap: specify PMUs are for ARMv7 CPUs

 arch/arm/mach-omap2/pmu.c                | 5 +++--
 arch/arm/mach-pxa/devices.c              | 2 +-
 arch/arm/mach-realview/realview_eb.c     | 3 ++-
 arch/arm/mach-realview/realview_pb1176.c | 2 +-
 arch/arm/mach-realview/realview_pb11mp.c | 2 +-
 arch/arm/mach-realview/realview_pba8.c   | 2 +-
 arch/arm/mach-realview/realview_pbx.c    | 2 +-
 arch/arm/mach-shmobile/setup-r8a7740.c   | 2 +-
 arch/arm/mach-shmobile/setup-sh73a0.c    | 2 +-
 arch/arm/plat-iop/pmu.c                  | 2 +-
 10 files changed, 13 insertions(+), 11 deletions(-)

-- 
1.9.1

[PATCHv2 1/5] arm: realview: specify PMU types

[Mark Rutland]

Now that we can specify which PMU variant we're likely to deal with, do
so in the realview board code. This will allow us to split the ARMv6,
ARMv7, and XScale PMU drivers.

The Realview EB may be used with ARMv6 or ARMv7 CPUs, but luckily
there's only a single ARMv7 CPU, so we can match that explicitly to
determine whether or not we have an ARMv7 PMU.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Russell King <linux@arm.linux.org.uk>
---
 arch/arm/mach-realview/realview_eb.c     | 3 ++-
 arch/arm/mach-realview/realview_pb1176.c | 2 +-
 arch/arm/mach-realview/realview_pb11mp.c | 2 +-
 arch/arm/mach-realview/realview_pba8.c   | 2 +-
 arch/arm/mach-realview/realview_pbx.c    | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 739d4f1..64c88d6 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -37,6 +37,7 @@
 #include <asm/pgtable.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/smp_twd.h>
+#include <asm/system_info.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -296,7 +297,6 @@ static struct resource pmu_resources[] = {
 };
 
 static struct platform_device pmu_device = {
-	.name			= "arm-pmu",
 	.id			= -1,
 	.num_resources		= ARRAY_SIZE(pmu_resources),
 	.resource		= pmu_resources,
@@ -451,6 +451,7 @@ static void __init realview_eb_init(void)
 		 */
 		l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);
 #endif
+		pmu_device.name = core_tile_a9mp() ? "armv7-pmu" : "armv6-pmu";
 		platform_device_register(&pmu_device);
 	}
 
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index b0e0dca..ce92c18 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -280,7 +280,7 @@ static struct resource pmu_resource = {
 };
 
 static struct platform_device pmu_device = {
-	.name			= "arm-pmu",
+	.name			= "armv6-pmu",
 	.id			= -1,
 	.num_resources		= 1,
 	.resource		= &pmu_resource,
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 47bf55f..15c45e2 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -262,7 +262,7 @@ static struct resource pmu_resources[] = {
 };
 
 static struct platform_device pmu_device = {
-	.name			= "arm-pmu",
+	.name			= "armv6-pmu",
 	.id			= -1,
 	.num_resources		= ARRAY_SIZE(pmu_resources),
 	.resource		= pmu_resources,
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 4e57a85..4c64662 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -240,7 +240,7 @@ static struct resource pmu_resource = {
 };
 
 static struct platform_device pmu_device = {
-	.name			= "arm-pmu",
+	.name			= "armv7-pmu",
 	.id			= -1,
 	.num_resources		= 1,
 	.resource		= &pmu_resource,
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index d89eb40..9a22b86 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -280,7 +280,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,
-- 
1.9.1

[PATCHv2 2/5] arm: pxa: specify PMUs are for XScale CPUs

[Mark Rutland]

Now that we can specify which PMU variant we're likely to deal with, do
so in the pxa board code. This will allow us to split the ARMv6, ARMv7,
and XScale PMU drivers.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
---
 arch/arm/mach-pxa/devices.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index ac7b3ea..3543466 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -40,7 +40,7 @@ static struct resource pxa_resource_pmu = {
 };
 
 struct platform_device pxa_device_pmu = {
-	.name		= "arm-pmu",
+	.name		= "xscale-pmu",
 	.id		= -1,
 	.resource	= &pxa_resource_pmu,
 	.num_resources	= 1,
-- 
1.9.1

[PATCHv2 3/5] arm: iop: specify PMUs are for XScale CPUs

[Mark Rutland]

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>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Russell King <linux@arm.linux.org.uk>
---
 arch/arm/plat-iop/pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,
-- 
1.9.1

[PATCHv2 4/5] arm: shmobile: specify PMUs are for ARMv7 CPUs

[Mark Rutland]

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>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7740.c | 2 +-
 arch/arm/mach-shmobile/setup-sh73a0.c  | 2 +-
 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,
-- 
1.9.1

[PATCHv2 4/5] arm: shmobile: specify PMUs are for ARMv7 CPUs

[Simon Horman]

On Tue, Jan 20, 2015 at 04:07:28PM +0000, Mark Rutland wrote:
> 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>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Simon Horman <horms@verge.net.au>

Tested-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  arch/arm/mach-shmobile/setup-r8a7740.c | 2 +-
>  arch/arm/mach-shmobile/setup-sh73a0.c  | 2 +-
>  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,
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCHv2 5/5] arm: omap: specify PMUs are for ARMv7 CPUs

[Mark Rutland]

Now that we can specify which PMU variant we're likely to deal with, do
so in the omap board code. This will allow us to split the ARMv6, ARMv7,
and XScale PMU drivers.

The unnecessary include of asm/pmu.h is also removed.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
---
 arch/arm/mach-omap2/pmu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
index 33c8846..a69e9a3 100644
--- a/arch/arm/mach-omap2/pmu.c
+++ b/arch/arm/mach-omap2/pmu.c
@@ -13,7 +13,7 @@
  */
 #include <linux/of.h>
 
-#include <asm/pmu.h>
+#include <asm/system_info.h>
 
 #include "soc.h"
 #include "omap_hwmod.h"
@@ -37,7 +37,8 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[])
 {
 	int i;
 	struct omap_hwmod *oh[3];
-	char *dev_name = "arm-pmu";
+	char *dev_name = cpu_architecture() == CPU_ARCH_ARMv6 ?
+			 "armv6-pmu" : "armv7-pmu";
 
 	if ((!oh_num) || (oh_num > 3))
 		return -EINVAL;
-- 
1.9.1

[PATCHv2 5/5] arm: omap: specify PMUs are for ARMv7 CPUs

[Tony Lindgren]

* Mark Rutland <mark.rutland@arm.com> [150120 08:12]:
> Now that we can specify which PMU variant we're likely to deal with, do
> so in the omap board code. This will allow us to split the ARMv6, ARMv7,
> and XScale PMU drivers.
> 
> The unnecessary include of asm/pmu.h is also removed.
> 
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Acked-by: Tony Lindgren <tony@atomide.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Olof Johansson <olof@lixom.net>
> ---
>  arch/arm/mach-omap2/pmu.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
> index 33c8846..a69e9a3 100644
> --- a/arch/arm/mach-omap2/pmu.c
> +++ b/arch/arm/mach-omap2/pmu.c
> @@ -13,7 +13,7 @@
>   */
>  #include <linux/of.h>
>  
> -#include <asm/pmu.h>
> +#include <asm/system_info.h>
>  
>  #include "soc.h"
>  #include "omap_hwmod.h"
> @@ -37,7 +37,8 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[])
>  {
>  	int i;
>  	struct omap_hwmod *oh[3];
> -	char *dev_name = "arm-pmu";
> +	char *dev_name = cpu_architecture() == CPU_ARCH_ARMv6 ?
> +			 "armv6-pmu" : "armv7-pmu";
>  
>  	if ((!oh_num) || (oh_num > 3))
>  		return -EINVAL;

Looks OK to me and should not conflict with anything I have queued:

Acked-by: Tony Lindgren <tony@atomide.com>

[PATCHv2 0/5] arm: specify PMU type in platform data

[Simon Horman]

On Tue, Jan 20, 2015 at 04:07:24PM +0000, Mark Rutland wrote:
> Currently the ARMv6, ARMv7, and XScale PMU drivers are coupled with each
> other, and all included in the same c file. To enable the splitting of
> the ARMv6, ARMv7, and XScale PMU drivers, and the conversion of the
> arm_pmu framework to a pure library, we need to be a be more precise
> when describing PMUs, to enable association of the PMU with the right
> driver. In device tree this is already implicit in the compatible
> string, but platform data currently only specifies "arm-pmu".
> 
> Commit 253d8c3d2518ca6f (arm: perf: add more specific platform device
> IDs) added "armv6-pmu", "armv7-pmu", and "xscale-pmu" platform device
> IDs, enabling the three to be distinguished. This series updates
> platform code to use these strings.
> 
> A later patch series will decouple the drivers.
> 
> Since v1 [1]:
> * Rebase to v3.19-rc4.
> * Add Acks.
> * Drop vexpress patches (platform code deleted).
> 
> Simon, in v1 you mentioned you were happy to take the shmobile patch
> through your tree. Are you still happy to do so, or to give your ack
> such that these can go through arm-soc together?
> 
> While I'm not too concerned which route these patches take, it would be
> nice to have a single base for the patches splitting the drivers.

Hi Mark,

assuming that this is targeted at v3.20 then it looks like your
changes do not conflict with anything I have queued up and
I am not likely to queue anything more up for the files in question
for that release. As my main concern is about conflicts I'm therefore
quite happy for you to take the shmobile patch through your tree.
I'll supply an ack accordingly.

> Thanks,
> Mark.
> 
> [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/304078.html
> 
> Mark Rutland (5):
>   arm: realview: specify PMU types
>   arm: pxa: specify PMUs are for XScale CPUs
>   arm: iop: specify PMUs are for XScale CPUs
>   arm: shmobile: specify PMUs are for ARMv7 CPUs
>   arm: omap: specify PMUs are for ARMv7 CPUs
> 
>  arch/arm/mach-omap2/pmu.c                | 5 +++--
>  arch/arm/mach-pxa/devices.c              | 2 +-
>  arch/arm/mach-realview/realview_eb.c     | 3 ++-
>  arch/arm/mach-realview/realview_pb1176.c | 2 +-
>  arch/arm/mach-realview/realview_pb11mp.c | 2 +-
>  arch/arm/mach-realview/realview_pba8.c   | 2 +-
>  arch/arm/mach-realview/realview_pbx.c    | 2 +-
>  arch/arm/mach-shmobile/setup-r8a7740.c   | 2 +-
>  arch/arm/mach-shmobile/setup-sh73a0.c    | 2 +-
>  arch/arm/plat-iop/pmu.c                  | 2 +-
>  10 files changed, 13 insertions(+), 11 deletions(-)
> 
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCHv2 0/5] arm: specify PMU type in platform data

[Mark Rutland]

On Wed, Jan 21, 2015 at 12:17:18AM +0000, Simon Horman wrote:
> On Tue, Jan 20, 2015 at 04:07:24PM +0000, Mark Rutland wrote:
> > Currently the ARMv6, ARMv7, and XScale PMU drivers are coupled with each
> > other, and all included in the same c file. To enable the splitting of
> > the ARMv6, ARMv7, and XScale PMU drivers, and the conversion of the
> > arm_pmu framework to a pure library, we need to be a be more precise
> > when describing PMUs, to enable association of the PMU with the right
> > driver. In device tree this is already implicit in the compatible
> > string, but platform data currently only specifies "arm-pmu".
> > 
> > Commit 253d8c3d2518ca6f (arm: perf: add more specific platform device
> > IDs) added "armv6-pmu", "armv7-pmu", and "xscale-pmu" platform device
> > IDs, enabling the three to be distinguished. This series updates
> > platform code to use these strings.
> > 
> > A later patch series will decouple the drivers.
> > 
> > Since v1 [1]:
> > * Rebase to v3.19-rc4.
> > * Add Acks.
> > * Drop vexpress patches (platform code deleted).
> > 
> > Simon, in v1 you mentioned you were happy to take the shmobile patch
> > through your tree. Are you still happy to do so, or to give your ack
> > such that these can go through arm-soc together?
> > 
> > While I'm not too concerned which route these patches take, it would be
> > nice to have a single base for the patches splitting the drivers.
> 
> Hi Mark,
> 
> assuming that this is targeted at v3.20 then it looks like your
> changes do not conflict with anything I have queued up and
> I am not likely to queue anything more up for the files in question
> for that release. As my main concern is about conflicts I'm therefore
> quite happy for you to take the shmobile patch through your tree.
> I'll supply an ack accordingly.

Thanks, Simon, it's much appreciated.

Arnd, Olof, are you happy to pick this up for v3.20? I believe all the
patches have now been appropriately acked.

If it makes things any easier I've placed the series (with new acks) on
my arm/perf/platform-updates branch [2], based atop of v3.19-rc4.

Thanks,
Mark.

[2] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git arm/perf/platform-updates

> 
> > Thanks,
> > Mark.
> > 
> > [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/304078.html
> > 
> > Mark Rutland (5):
> >   arm: realview: specify PMU types
> >   arm: pxa: specify PMUs are for XScale CPUs
> >   arm: iop: specify PMUs are for XScale CPUs
> >   arm: shmobile: specify PMUs are for ARMv7 CPUs
> >   arm: omap: specify PMUs are for ARMv7 CPUs
> > 
> >  arch/arm/mach-omap2/pmu.c                | 5 +++--
> >  arch/arm/mach-pxa/devices.c              | 2 +-
> >  arch/arm/mach-realview/realview_eb.c     | 3 ++-
> >  arch/arm/mach-realview/realview_pb1176.c | 2 +-
> >  arch/arm/mach-realview/realview_pb11mp.c | 2 +-
> >  arch/arm/mach-realview/realview_pba8.c   | 2 +-
> >  arch/arm/mach-realview/realview_pbx.c    | 2 +-
> >  arch/arm/mach-shmobile/setup-r8a7740.c   | 2 +-
> >  arch/arm/mach-shmobile/setup-sh73a0.c    | 2 +-
> >  arch/arm/plat-iop/pmu.c                  | 2 +-
> >  10 files changed, 13 insertions(+), 11 deletions(-)
> > 
> > -- 
> > 1.9.1
> > 
> > 
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> > 
> 

[PATCHv2 0/5] arm: specify PMU type in platform data

[Mark Rutland]

[adding arm at kernel.org]

Arnd/Olof, are you happy to take these?

Everything has been appropriately acked, and as mentioned below the
series can also be found on my kernel.org tree:

git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git arm/perf/platform-updates

Thanks,
Mark.

On Wed, Jan 21, 2015 at 02:30:28PM +0000, Mark Rutland wrote:
> On Wed, Jan 21, 2015 at 12:17:18AM +0000, Simon Horman wrote:
> > On Tue, Jan 20, 2015 at 04:07:24PM +0000, Mark Rutland wrote:
> > > Currently the ARMv6, ARMv7, and XScale PMU drivers are coupled with each
> > > other, and all included in the same c file. To enable the splitting of
> > > the ARMv6, ARMv7, and XScale PMU drivers, and the conversion of the
> > > arm_pmu framework to a pure library, we need to be a be more precise
> > > when describing PMUs, to enable association of the PMU with the right
> > > driver. In device tree this is already implicit in the compatible
> > > string, but platform data currently only specifies "arm-pmu".
> > > 
> > > Commit 253d8c3d2518ca6f (arm: perf: add more specific platform device
> > > IDs) added "armv6-pmu", "armv7-pmu", and "xscale-pmu" platform device
> > > IDs, enabling the three to be distinguished. This series updates
> > > platform code to use these strings.
> > > 
> > > A later patch series will decouple the drivers.
> > > 
> > > Since v1 [1]:
> > > * Rebase to v3.19-rc4.
> > > * Add Acks.
> > > * Drop vexpress patches (platform code deleted).
> > > 
> > > Simon, in v1 you mentioned you were happy to take the shmobile patch
> > > through your tree. Are you still happy to do so, or to give your ack
> > > such that these can go through arm-soc together?
> > > 
> > > While I'm not too concerned which route these patches take, it would be
> > > nice to have a single base for the patches splitting the drivers.
> > 
> > Hi Mark,
> > 
> > assuming that this is targeted at v3.20 then it looks like your
> > changes do not conflict with anything I have queued up and
> > I am not likely to queue anything more up for the files in question
> > for that release. As my main concern is about conflicts I'm therefore
> > quite happy for you to take the shmobile patch through your tree.
> > I'll supply an ack accordingly.
> 
> Thanks, Simon, it's much appreciated.
> 
> Arnd, Olof, are you happy to pick this up for v3.20? I believe all the
> patches have now been appropriately acked.
> 
> If it makes things any easier I've placed the series (with new acks) on
> my arm/perf/platform-updates branch [2], based atop of v3.19-rc4.
> 
> Thanks,
> Mark.
> 
> [2] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git arm/perf/platform-updates
> 
> > 
> > > Thanks,
> > > Mark.
> > > 
> > > [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/304078.html
> > > 
> > > Mark Rutland (5):
> > >   arm: realview: specify PMU types
> > >   arm: pxa: specify PMUs are for XScale CPUs
> > >   arm: iop: specify PMUs are for XScale CPUs
> > >   arm: shmobile: specify PMUs are for ARMv7 CPUs
> > >   arm: omap: specify PMUs are for ARMv7 CPUs
> > > 
> > >  arch/arm/mach-omap2/pmu.c                | 5 +++--
> > >  arch/arm/mach-pxa/devices.c              | 2 +-
> > >  arch/arm/mach-realview/realview_eb.c     | 3 ++-
> > >  arch/arm/mach-realview/realview_pb1176.c | 2 +-
> > >  arch/arm/mach-realview/realview_pb11mp.c | 2 +-
> > >  arch/arm/mach-realview/realview_pba8.c   | 2 +-
> > >  arch/arm/mach-realview/realview_pbx.c    | 2 +-
> > >  arch/arm/mach-shmobile/setup-r8a7740.c   | 2 +-
> > >  arch/arm/mach-shmobile/setup-sh73a0.c    | 2 +-
> > >  arch/arm/plat-iop/pmu.c                  | 2 +-
> > >  10 files changed, 13 insertions(+), 11 deletions(-)
> > > 
> > > -- 
> > > 1.9.1
> > > 
> > > 
> > > _______________________________________________
> > > linux-arm-kernel mailing list
> > > linux-arm-kernel at lists.infradead.org
> > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> > > 
> > 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCHv2 0/5] arm: specify PMU type in platform data

[Olof Johansson]

On Mon, Feb 02, 2015 at 04:51:30PM +0000, Mark Rutland wrote:
> [adding arm at kernel.org]
> 
> Arnd/Olof, are you happy to take these?
> 
> Everything has been appropriately acked, and as mentioned below the
> series can also be found on my kernel.org tree:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git arm/perf/platform-updates

Thanks, applied the patches to next/cleanup.


-Olof