From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Tue, 27 Aug 2013 18:33:13 +1000 [thread overview]
Message-ID: <20130827183313.aa7d51c6dd0b21cd8168aa35@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1768 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 ("ARM: mvebu:
remove device tree parsing for cpu nodes") from the tree and commit
994c8c94b419 ("ARM: mvebu: Remove the harcoded BootROM window
allocation") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-mvebu/platsmp.c
index 594b63d,4f960f0..0000000
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@@ -29,28 -30,31 +30,31 @@@
#include "pmsu.h"
#include "coherency.h"
+ #define AXP_BOOTROM_BASE 0xfff00000
+ #define AXP_BOOTROM_SIZE 0x100000
+
+static struct clk *__init get_cpu_clk(int cpu)
+{
+ struct clk *cpu_clk;
+ struct device_node *np = of_get_cpu_node(cpu, NULL);
+
+ if (WARN(!np, "missing cpu node\n"))
+ return NULL;
+ cpu_clk = of_clk_get(np, 0);
+ if (WARN_ON(IS_ERR(cpu_clk)))
+ return NULL;
+ return cpu_clk;
+}
+
void __init set_secondary_cpus_clock(void)
{
- int thiscpu;
+ int thiscpu, cpu;
unsigned long rate;
- struct clk *cpu_clk = NULL;
- struct device_node *np = NULL;
+ struct clk *cpu_clk;
thiscpu = smp_processor_id();
- for_each_node_by_type(np, "cpu") {
- int err;
- int cpu;
-
- err = of_property_read_u32(np, "reg", &cpu);
- if (WARN_ON(err))
- return;
-
- if (cpu == thiscpu) {
- cpu_clk = of_clk_get(np, 0);
- break;
- }
- }
- if (WARN_ON(IS_ERR(cpu_clk)))
+ cpu_clk = get_cpu_clk(thiscpu);
+ if (!cpu_clk)
return;
clk_prepare_enable(cpu_clk);
rate = clk_get_rate(cpu_clk);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-27 8:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 8:33 Stephen Rothwell [this message]
2013-08-27 15:30 ` linux-next: manual merge of the arm-soc tree with the pm tree Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2013-10-29 8:00 Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki
2013-08-29 8:04 Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson
2013-09-02 18:09 ` Lorenzo Pieralisi
2013-09-09 17:22 ` Kevin Hilman
2013-09-10 8:59 ` Lorenzo Pieralisi
2013-04-24 6:54 Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2013-04-10 7:17 Stephen Rothwell
2013-04-10 8:36 ` Kukjin Kim
2013-04-11 8:37 ` Olof Johansson
2013-04-19 10:59 ` Kukjin Kim
2012-09-24 9:21 Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson
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=20130827183313.aa7d51c6dd0b21cd8168aa35@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=ezequiel.garcia@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@sisk.pl \
--cc=sudeep.karkadanagesha@arm.com \
/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).