From: Fabio Estevam <festevam@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Shawn Guo <shawn.guo@linaro.org>,
Fabio Estevam <fabio.estevam@freescale.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the imx-mxs tree
Date: Wed, 9 Oct 2013 13:56:25 -0300 [thread overview]
Message-ID: <CAOMZO5CVZHNWcash5cb4MiMCU0K2R+X4Jio3vpaMA4VwE81QkQ@mail.gmail.com> (raw)
In-Reply-To: <1381328067-1593-5-git-send-email-treding@nvidia.com>
Hi Thierry,
On Wed, Oct 9, 2013 at 11:14 AM, Thierry Reding
<thierry.reding@gmail.com> wrote:
> Today's linux-next merge of the imx-mxs tree got conflicts in
>
> arch/arm/mach-imx/clk-imx51-imx53.c
> arch/arm/mach-imx/mach-imx6q.c
>
> caused by commits 0efe995 (ARM: mach-imx: clk-imx51-imx53: Retrieve base
> address and irq from dt), d2b36f6 (ARM: imx: replace imx6q_restart()
> with mxc_restart()) and 4d9d18a (ARM: imx: remove custom .init_time
> hook).
>
> I fixed them up (see below). Please verify that the resolution looks
> good.
...
> +static void __init mx53_clocks_init(struct device_node *np)
> {
> - int i;
> + int i, irq;
> unsigned long r;
> - struct device_node *np;
> + void __iomem *base;
>
> clk[pll1_sw] = imx_clk_pllv2("pll1_sw", "osc", MX53_DPLL1_BASE);
> clk[pll2_sw] = imx_clk_pllv2("pll2_sw", "osc", MX53_DPLL2_BASE);
> @@@ -568,5 -567,22 +569,13 @@@
>
> r = clk_round_rate(clk[usboh3_per_gate], 54000000);
> clk_set_rate(clk[usboh3_per_gate], r);
> +
> + np = of_find_compatible_node(NULL, NULL, "fsl,imx53-gpt");
> + base = of_iomap(np, 0);
> + WARN_ON(!base);
> + irq = irq_of_parse_and_map(np, 0);
> + mxc_timer_init(base, irq);
> +
> + return 0;
This 'return 0' should be removed as the function now changed to void.
I have sent a patch fixing it.
Regards,
Fabio Estevam
next prev parent reply other threads:[~2013-10-09 16:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding
2013-10-09 14:14 ` [PATCH] ipv6: Unbreak build Thierry Reding
2013-10-09 14:41 ` Eric Dumazet
2013-10-10 10:48 ` Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the clk tree Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 16:56 ` Fabio Estevam [this message]
2013-10-09 14:14 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-09 14:21 ` Jason Cooper
2013-10-09 14:37 ` Jason Cooper
2013-10-10 10:57 ` Thierry Reding
2013-10-10 11:40 ` Jason Cooper
2013-10-09 15:29 ` linux-next: Tree for Oct 9 Guenter Roeck
2013-10-09 15:44 ` Guenter Roeck
2013-10-09 17:55 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
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
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=CAOMZO5CVZHNWcash5cb4MiMCU0K2R+X4Jio3vpaMA4VwE81QkQ@mail.gmail.com \
--to=festevam@gmail.com \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=shawn.guo@linaro.org \
--cc=thierry.reding@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).