From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Quentin Schulz <quentin.schulz@free-electrons.com>
Subject: linux-next: manual merge of the pm tree with the arm-soc tree
Date: Thu, 20 Apr 2017 10:34:27 +1000 [thread overview]
Message-ID: <20170420103427.62fbf195@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm/boot/dts/sun8i-a33.dtsi
between commits:
66c373228dc4 ("ARM: sun8i: a33: Add the Mali OPPs")
e6bd37627e92 ("ARM: sun8i: a33: add all operating points")
from the arm-soc tree and commit:
d87bd1942058 ("PM / OPP: Use - instead of @ for DT entries")
from the pm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
I suspect that arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts may need
some fixups as well.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/boot/dts/sun8i-a33.dtsi
index 013978259372,a2c555d6475c..000000000000
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@@ -50,73 -49,19 +50,73 @@@
compatible = "operating-points-v2";
opp-shared;
- opp@120000000 {
++ opp-120000000 {
+ opp-hz = /bits/ 64 <120000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@240000000 {
++ opp-240000000 {
+ opp-hz = /bits/ 64 <240000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@312000000 {
++ opp-312000000 {
+ opp-hz = /bits/ 64 <312000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@408000000 {
++ opp-408000000 {
+ opp-hz = /bits/ 64 <408000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@480000000 {
++ opp-480000000 {
+ opp-hz = /bits/ 64 <480000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@504000000 {
++ opp-504000000 {
+ opp-hz = /bits/ 64 <504000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@600000000 {
++ opp-600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@648000000 {
+ opp-648000000 {
opp-hz = /bits/ 64 <648000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp@720000000 {
++ opp-720000000 {
+ opp-hz = /bits/ 64 <720000000>;
+ opp-microvolt = <1100000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@816000000 {
+ opp-816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <1100000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp@912000000 {
++ opp-912000000 {
+ opp-hz = /bits/ 64 <912000000>;
+ opp-microvolt = <1200000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
- opp@1008000000 {
+ opp-1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <1200000>;
clock-latency-ns = <244144>; /* 8 32k periods */
@@@ -156,27 -100,6 +156,27 @@@
status = "disabled";
};
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&ths>;
+ };
+
+ mali_opp_table: gpu-opp-table {
+ compatible = "operating-points-v2";
+
- opp@144000000 {
++ opp-144000000 {
+ opp-hz = /bits/ 64 <144000000>;
+ };
+
- opp@240000000 {
++ opp-240000000 {
+ opp-hz = /bits/ 64 <240000000>;
+ };
+
- opp@384000000 {
++ opp-384000000 {
+ opp-hz = /bits/ 64 <384000000>;
+ };
+ };
+
memory {
reg = <0x40000000 0x80000000>;
};
next reply other threads:[~2017-04-20 0:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-20 0:34 Stephen Rothwell [this message]
2017-04-20 0:38 ` linux-next: manual merge of the pm tree with the arm-soc tree Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2020-10-21 0:00 Stephen Rothwell
2017-04-21 0:54 Stephen Rothwell
2017-04-21 5:53 ` Arnd Bergmann
2017-04-21 6:39 ` santosh.shilimkar
2017-04-21 9:31 ` Arnd Bergmann
2017-04-21 21:02 ` santosh.shilimkar
2017-04-21 21:31 ` Rafael J. Wysocki
2017-04-21 21:50 ` Santosh Shilimkar
2017-04-21 21:44 ` Arnd Bergmann
2017-04-21 21:54 ` Santosh Shilimkar
2017-04-24 18:02 ` Dave Gerlach
2017-04-24 18:22 ` Santosh Shilimkar
2017-04-21 0:50 Stephen Rothwell
2016-04-29 1:18 Stephen Rothwell
2014-09-10 4:18 Stephen Rothwell
2014-09-10 23:29 ` Rafael J. Wysocki
2014-09-10 4:14 Stephen Rothwell
2014-07-30 2:23 Stephen Rothwell
2014-07-30 12:55 ` Rafael J. Wysocki
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=20170420103427.62fbf195@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=olof@lixom.net \
--cc=quentin.schulz@free-electrons.com \
--cc=rjw@rjwysocki.net \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).