linux-kernel - Re: linux-next: manual merge of the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAOMZO5CVZHNWcash5cb4MiMCU0K2R+X4Jio3vpaMA4VwE81QkQ@mail.gmail.com>
Date:	Wed, 9 Oct 2013 13:56:25 -0300
From:	Fabio Estevam <festevam@...il.com>
To:	Thierry Reding <thierry.reding@...il.com>
Cc:	Shawn Guo <shawn.guo@...aro.org>,
	Fabio Estevam <fabio.estevam@...escale.com>,
	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the imx-mxs tree

Hi Thierry,

On Wed, Oct 9, 2013 at 11:14 AM, Thierry Reding
<thierry.reding@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/