From: Will Deacon <will.deacon@arm•com>
To: Olof Johansson <olof@lixom•net>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Arnd Bergmann <arnd@arndb•de>,
Stephen Boyd <sboyd@codeaurora•org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
Kumar Gala <galak@codeaurora•org>,
"linux-arm-kernel@lists•infradead.org"
<linux-arm-kernel@lists•infradead.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Date: Fri, 21 Feb 2014 11:09:50 +0000 [thread overview]
Message-ID: <20140221110950.GB8731@mudshark.cambridge.arm.com> (raw)
In-Reply-To: <CAOesGMimJxYLor11EQ-Cn9BnZGg60VrOFC8ZqBdC+wNunptm8w@mail.gmail.com>
On Fri, Feb 21, 2014 at 01:02:47AM +0000, Olof Johansson wrote:
> On Thu, Feb 20, 2014 at 4:58 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/boot/dts/qcom-msm8960-cdp.dts between commit a1d711938959 ("ARM:
> > dts: msm: Add krait-pmu to platforms with Krait CPUs") from the arm-perf
> > tree and commit cc60a1a4d47a ("ARM: dts: msm: split out msm8660 and
> > msm8960 soc into dts include") from the arm-soc tree.
> >
> > I fixed it up (probably not the best way ... see below) and can carry the
> > fix as necessary (no action is required).
>
> Will, I think we'll be better off taking dts changes through arm-soc,
> unless there's a good reason to take them through other trees (such as
> the perf tree in this case). Is there, or should we move them over?
Sure, I can drop that from my tree (it came as part of the series adding
Krait PMU support).
I've included the original patch below so you can put it into arm-soc.
Cheers,
Will
--->8
commit a1d711938959935436e935ebb4ea6199bceb021d
Author: Stephen Boyd <sboyd@codeaurora•org>
Date: Fri Feb 7 21:01:25 2014 +0000
ARM: dts: msm: Add krait-pmu to platforms with Krait CPUs
Allows us to probe the performance counters on Krait CPUs.
Signed-off-by: Stephen Boyd <sboyd@codeaurora•org>
Signed-off-by: Will Deacon <will.deacon@arm•com>
diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index 7c30de4fa302..66c59a6a722c 100644
--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -9,6 +9,12 @@
compatible = "qcom,msm8960-cdp", "qcom,msm8960";
interrupt-parent = <&intc>;
+ cpu-pmu {
+ compatible = "qcom,krait-pmu";
+ interrupts = <1 10 0x304>;
+ qcom,no-pc-write;
+ };
+
intc: interrupt-controller@2000000 {
compatible = "qcom,msm-qgic2";
interrupt-controller;
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 9e5dadb101eb..1eff4130cde0 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -9,6 +9,11 @@
compatible = "qcom,msm8974";
interrupt-parent = <&intc>;
+ cpu-pmu {
+ compatible = "qcom,krait-pmu";
+ interrupts = <1 7 0xf04>;
+ };
+
soc: soc {
#address-cells = <1>;
#size-cells = <1>;
next prev parent reply other threads:[~2014-02-21 11:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 0:58 linux-next: manual merge of the arm-soc tree with the arm-perf tree Stephen Rothwell
2014-02-21 1:02 ` Olof Johansson
2014-02-21 11:09 ` Will Deacon [this message]
2014-02-22 0:46 ` Olof Johansson
2014-02-21 1:02 ` Stephen Boyd
-- strict thread matches above, loose matches on Subject: below --
2015-03-23 0:33 Stephen Rothwell
2015-03-23 14:41 ` Abhilash Kesavan
2015-03-23 15:13 ` Suzuki K. Poulose
2015-03-23 21:16 ` Stephen Rothwell
2015-03-24 14:59 ` Suzuki K. Poulose
2024-01-02 23:03 Stephen Rothwell
2024-01-03 17:30 ` Will Deacon
2024-01-03 17:38 ` Arnd Bergmann
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=20140221110950.GB8731@mudshark.cambridge.arm.com \
--to=will.deacon@arm$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=galak@codeaurora$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sboyd@codeaurora$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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