From: jon-hunter@ti•com (Jon Hunter)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 4/9] ARM: pmu: remove arm_pmu_type enumeration
Date: Fri, 17 Aug 2012 09:08:51 -0500 [thread overview]
Message-ID: <502E5073.6000901@ti.com> (raw)
In-Reply-To: <1344620195-22372-5-git-send-email-will.deacon@arm.com>
Hi Will, Tony,
On 08/10/2012 12:36 PM, Will Deacon wrote:
> From: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm•com>
>
> The arm_pmu_type enumeration was initially introduced to identify
> different PMU types in the system, the usual one being that on the CPU
> (ARM_PMU_DEVICE_CPU). With the removal of the PMU reservation code and
> the introduction of devicetree bindings for the CPU PMU, the enumeration
> is no longer required.
>
> This patch removes the enumeration and updates the various CPU PMU
> platform devices so that they no longer pass an .id field referring
> to identify the PMU type.
[snip]
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index c00c689..02b9478 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -23,7 +23,6 @@
> #include <mach/irqs.h>
> #include <asm/mach-types.h>
> #include <asm/mach/map.h>
> -#include <asm/pmu.h>
>
> #include "iomap.h"
> #include <plat/board.h>
> @@ -448,7 +447,7 @@ static struct resource omap3_pmu_resource = {
>
> static struct platform_device omap_pmu_device = {
> .name = "arm-pmu",
> - .id = ARM_PMU_DEVICE_CPU,
> + .id = -1,
> .num_resources = 1,
> };
I know that I have already ack-ed the change and it is fine with me,
however, I see a potential merge conflict here with my patch [1]
(assuming that these all go into v3.7) where I am moving the above
structure.
For testing I have rebased my series on top of this series and it is
working well so far on OMAP4460.
I am hoping to get the next version of my series for omap out next week.
However, before I did I wanted to ask how we should handle the above
change. Should I submit my series as rebased on top of this?
Thanks
Jon
[1]
https://github.com/jonhunter/linux/commit/6a07e3aa21f956bea7858704c224b7f50d25e1c0
next prev parent reply other threads:[~2012-08-17 14:08 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 17:36 [PATCH 0/9] ARM perf updates for 3.7 Will Deacon
2012-08-10 17:36 ` [PATCH 1/9] ARM: PMU: Add runtime PM Support Will Deacon
2012-08-11 15:09 ` Ming Lei
2012-08-13 10:40 ` Will Deacon
2012-08-16 13:56 ` Jon Hunter
2012-08-10 17:36 ` [PATCH 2/9] ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs Will Deacon
2012-08-10 18:42 ` Rob Herring
2012-08-10 17:36 ` [PATCH 3/9] ARM: pmu: remove unused reservation mechanism Will Deacon
2012-08-10 17:36 ` [PATCH 4/9] ARM: pmu: remove arm_pmu_type enumeration Will Deacon
2012-08-13 14:17 ` Linus Walleij
2012-08-13 21:57 ` Jiandong Zheng
2012-08-14 8:43 ` Sudeep KarkadaNagesha
2012-08-14 16:53 ` Jiandong Zheng
2012-08-16 13:59 ` Jon Hunter
2012-08-17 14:08 ` Jon Hunter [this message]
2012-08-20 9:01 ` Will Deacon
2012-08-20 13:05 ` Jon Hunter
2012-08-23 5:45 ` Kukjin Kim
2012-08-10 17:36 ` [PATCH 5/9] ARM: perf: remove mysterious compiler barrier Will Deacon
2012-08-10 17:36 ` [PATCH 6/9] ARM: perf: probe devicetree in preference to current CPU Will Deacon
2012-08-10 17:36 ` [PATCH 7/9] ARM: perf: prepare for moving CPU PMU code into separate file Will Deacon
2012-08-10 17:36 ` [PATCH 8/9] ARM: perf: move CPU-specific PMU handling " Will Deacon
2012-08-10 17:36 ` [PATCH 9/9] ARM: perf: move irq registration into pmu implementation Will Deacon
2012-08-13 9:11 ` [PATCH 0/9] ARM perf updates for 3.7 Hui Wang
2012-08-13 9:32 ` Will Deacon
2012-08-14 1:46 ` Hui Wang
2013-02-28 6:54 ` i.MX6Quad PMU irq handling (was: Re: [PATCH 0/9] ARM perf updates for 3.7) Dirk Behme
2013-02-28 7:27 ` Shawn Guo
2013-02-28 7:38 ` i.MX6Quad PMU irq handling Hui Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=502E5073.6000901@ti.com \
--to=jon-hunter@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox