From: Thierry Reding <thierry.reding@gmail.com>
To: Jason Cooper <jason@lakedaemon.net>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: manual merge of the mvebu tree
Date: Tue, 8 Oct 2013 15:44:13 +0200 [thread overview]
Message-ID: <1381239855-16314-3-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381239855-16314-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the mvebu tree got conflicts in:
arch/arm/mach-dove/board-dt.c
caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init),
e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5
(ARM: dove: remove custom .init_time hook).
I fixed them up (see below). Please verify that the resolution looks
correct.
Thanks,
Thierry
---
diff --cc arch/arm/mach-dove/board-dt.c
index ddb8663,9a116d7..49fa9ab
--- a/arch/arm/mach-dove/board-dt.c
+++ b/arch/arm/mach-dove/board-dt.c
@@@ -17,37 -20,15 +17,8 @@@
#include <mach/dove.h>
#include <mach/pm.h>
#include <plat/common.h>
-#include <plat/irq.h>
#include "common.h"
- /*
- * There are still devices that doesn't even know about DT,
- * get clock gates here and add a clock lookup.
- */
- static void __init dove_legacy_clk_init(void)
- {
- struct device_node *np = of_find_compatible_node(NULL, NULL,
- "marvell,dove-gating-clock");
- struct of_phandle_args clkspec;
-
- clkspec.np = np;
- clkspec.args_count = 1;
-
- clkspec.args[0] = CLOCK_GATING_BIT_PCIE0;
- orion_clkdev_add("0", "pcie",
- of_clk_get_from_provider(&clkspec));
-
- clkspec.args[0] = CLOCK_GATING_BIT_PCIE1;
- orion_clkdev_add("1", "pcie",
- of_clk_get_from_provider(&clkspec));
- }
-
- static void __init dove_dt_init_early(void)
-static void __init dove_dt_time_init(void)
--{
- mvebu_mbus_init("marvell,dove-mbus",
- BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
- DOVE_MC_WINS_BASE, DOVE_MC_WINS_SZ);
- of_clk_init(NULL);
- clocksource_of_init();
--}
--
static void __init dove_dt_init(void)
{
pr_info("Dove 88AP510 SoC\n");
@@@ -73,7 -47,7 +37,6 @@@ static const char * const dove_dt_board
DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)")
.map_io = dove_map_io,
- .init_early = dove_dt_init_early,
- .init_time = dove_dt_time_init,
.init_machine = dove_dt_init,
.restart = dove_restart,
.dt_compat = dove_dt_board_compat,
next prev parent reply other threads:[~2013-10-08 13:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 1:25 ` Shawn Guo
2013-10-08 13:44 ` Thierry Reding [this message]
2013-10-08 14:08 ` manual merge of the mvebu tree Jason Cooper
2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the tty-next tree Thierry Reding
2013-10-09 6:19 ` Greg Kroah-Hartman
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=1381239855-16314-3-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.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).