From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Russell King <linux@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Victor Kamensky <victor.kamensky@linaro.org>,
Taras Kondratiuk <taras.kondratiuk@linaro.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the tree
Date: Tue, 27 May 2014 10:49:32 -0700 [thread overview]
Message-ID: <20140527174932.GB18063@atomide.com> (raw)
In-Reply-To: <20140527104526.5c6f819e@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [140526 17:46]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/omap-mpuss-lowpower.c between commit 4e4bb5c72f6b
> ("ARM: l2c: omap2: avoid reading directly from the L2 registers in
> platform code") from the arm tree and commit edfaf05c2fcb ("ARM:
> OMAP2+: raw read and write endian fix") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
OK thanks. FYI, looks like for this one the subject is missing which
tree it conflicts with.
Regards,
Tony
> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
> @@@ -187,15 -187,19 +187,15 @@@ static void l2x0_pwrst_prepare(unsigne
> * in every restore MPUSS OFF path.
> */
> #ifdef CONFIG_CACHE_L2X0
> -static void save_l2x0_context(void)
> +static void __init save_l2x0_context(void)
> {
> - __raw_writel(l2x0_saved_regs.aux_ctrl,
> - sar_base + L2X0_AUXCTRL_OFFSET);
> - __raw_writel(l2x0_saved_regs.prefetch_ctrl,
> - sar_base + L2X0_PREFETCH_CTRL_OFFSET);
> - u32 val;
> - void __iomem *l2x0_base = omap4_get_l2cache_base();
> - if (l2x0_base) {
> - val = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
> - writel_relaxed(val, sar_base + L2X0_AUXCTRL_OFFSET);
> - val = readl_relaxed(l2x0_base + L2X0_PREFETCH_CTRL);
> - writel_relaxed(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);
> - }
> ++ writel_relaxed(l2x0_saved_regs.aux_ctrl,
> ++ sar_base + L2X0_AUXCTRL_OFFSET);
> ++ writel_relaxed(l2x0_saved_regs.prefetch_ctrl,
> ++ sar_base + L2X0_PREFETCH_CTRL_OFFSET);
> }
> #else
> -static void save_l2x0_context(void)
> +static void __init save_l2x0_context(void)
> {}
> #endif
>
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the tree
Date: Tue, 27 May 2014 10:49:32 -0700 [thread overview]
Message-ID: <20140527174932.GB18063@atomide.com> (raw)
In-Reply-To: <20140527104526.5c6f819e@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [140526 17:46]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/omap-mpuss-lowpower.c between commit 4e4bb5c72f6b
> ("ARM: l2c: omap2: avoid reading directly from the L2 registers in
> platform code") from the arm tree and commit edfaf05c2fcb ("ARM:
> OMAP2+: raw read and write endian fix") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
OK thanks. FYI, looks like for this one the subject is missing which
tree it conflicts with.
Regards,
Tony
> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
> @@@ -187,15 -187,19 +187,15 @@@ static void l2x0_pwrst_prepare(unsigne
> * in every restore MPUSS OFF path.
> */
> #ifdef CONFIG_CACHE_L2X0
> -static void save_l2x0_context(void)
> +static void __init save_l2x0_context(void)
> {
> - __raw_writel(l2x0_saved_regs.aux_ctrl,
> - sar_base + L2X0_AUXCTRL_OFFSET);
> - __raw_writel(l2x0_saved_regs.prefetch_ctrl,
> - sar_base + L2X0_PREFETCH_CTRL_OFFSET);
> - u32 val;
> - void __iomem *l2x0_base = omap4_get_l2cache_base();
> - if (l2x0_base) {
> - val = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
> - writel_relaxed(val, sar_base + L2X0_AUXCTRL_OFFSET);
> - val = readl_relaxed(l2x0_base + L2X0_PREFETCH_CTRL);
> - writel_relaxed(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);
> - }
> ++ writel_relaxed(l2x0_saved_regs.aux_ctrl,
> ++ sar_base + L2X0_AUXCTRL_OFFSET);
> ++ writel_relaxed(l2x0_saved_regs.prefetch_ctrl,
> ++ sar_base + L2X0_PREFETCH_CTRL_OFFSET);
> }
> #else
> -static void save_l2x0_context(void)
> +static void __init save_l2x0_context(void)
> {}
> #endif
>
next prev parent reply other threads:[~2014-05-27 17:49 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 0:45 linux-next: manual merge of the arm-soc tree with the tree Stephen Rothwell
2014-05-27 0:45 ` Stephen Rothwell
2014-05-27 0:45 ` Stephen Rothwell
2014-05-27 17:49 ` Tony Lindgren [this message]
2014-05-27 17:49 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2014-04-07 0:21 Stephen Rothwell
2014-04-07 0:21 ` Stephen Rothwell
2014-04-07 0:21 ` Stephen Rothwell
2013-10-29 7:57 Stephen Rothwell
2013-10-29 7:57 ` Stephen Rothwell
2013-10-29 7:57 ` Stephen Rothwell
2013-06-21 6:45 Stephen Rothwell
2013-06-21 6:45 ` Stephen Rothwell
2013-06-21 6:45 ` Stephen Rothwell
2012-11-27 4:48 Stephen Rothwell
2012-11-27 4:48 ` Stephen Rothwell
2012-11-27 4:48 ` Stephen Rothwell
2012-09-25 6:37 Stephen Rothwell
2012-09-25 6:37 ` Stephen Rothwell
2012-09-25 6:37 ` Stephen Rothwell
2012-09-25 7:14 ` Tony Prisk
2012-09-25 7:14 ` Tony Prisk
2012-09-25 7:14 ` Tony Prisk
2012-09-17 8:02 Stephen Rothwell
2012-09-17 8:02 ` Stephen Rothwell
2012-09-17 8:02 ` Stephen Rothwell
2012-03-08 6:03 Stephen Rothwell
2012-03-08 6:03 ` Stephen Rothwell
2012-03-08 6:03 ` Stephen Rothwell
2012-03-08 6:17 ` Stephen Rothwell
2012-03-08 6:17 ` Stephen Rothwell
2012-03-08 6:17 ` Stephen Rothwell
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=20140527174932.GB18063@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=taras.kondratiuk@linaro.org \
--cc=victor.kamensky@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.