From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shawn Guo <shawn.guo@linaro.org>, 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,
Anson Huang <b20788@freescale.com>
Subject: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Thu, 20 Feb 2014 11:42:42 +1100 [thread overview]
Message-ID: <20140220114242.b3ce4d77b677544d2feebd3e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2519 bytes --]
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/mach-imx/Makefile and arch/arm/mach-imx/common.h between commit
28a9f3b078c5 ("ARM: imx6: build pm-imx6q.c independently of CONFIG_PM")
from the arm-soc tree and commits 8dd751932545 ("ARM: imx: add suspend in
ocram support for i.mx6q") and 79a8eef47d12 ("RM: imx: add suspend in
ocram support for i.mx6sl") from the imx-mxs tree.
I fixed it up (I think, 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-imx/Makefile
index ec419649320f,02cbb48c1d0a..000000000000
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@@ -101,10 -102,13 +102,17 @@@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.
obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
+obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
+# i.MX6SL reuses i.MX6Q code
+obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o
+
+ ifeq ($(CONFIG_PM),y)
+ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
-obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o suspend-imx6.o
++obj-$(CONFIG_SOC_IMX6Q) += suspend-imx6.o
+ # i.MX6SL reuses i.MX6Q code
-obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o suspend-imx6.o
++obj-$(CONFIG_SOC_IMX6SL) += suspend-imx6.o
+ endif
+
# i.MX5 based machines
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
diff --cc arch/arm/mach-imx/common.h
index baf439dc22d8,4dd932af708c..000000000000
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -144,11 -145,19 +145,17 @@@ void imx6sl_set_wait_clk(bool enter)
void imx_cpu_die(unsigned int cpu);
int imx_cpu_kill(unsigned int cpu);
+void imx6q_pm_init(void);
+void imx6q_pm_set_ccm_base(void __iomem *base);
#ifdef CONFIG_PM
+ void imx6_suspend(void __iomem *ocram_vbase);
-void imx6q_pm_init(void);
+ void imx6dl_pm_init(void);
+ void imx6sl_pm_init(void);
-void imx6q_pm_set_ccm_base(void __iomem *base);
void imx5_pm_init(void);
#else
+ static inline void imx6_suspend(void __iomem *ocram_vbase) {}
-static inline void imx6q_pm_init(void) {}
+ static inline void imx6dl_pm_init(void) {}
+ static inline void imx6sl_pm_init(void) {}
-static inline void imx6q_pm_set_ccm_base(void __iomem *base) {}
static inline void imx5_pm_init(void) {}
#endif
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-20 0:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 0:42 Stephen Rothwell [this message]
2014-02-20 1:30 ` linux-next: manual merge of the imx-mxs tree with the arm-soc tree Shawn Guo
-- strict thread matches above, loose matches on Subject: below --
2019-05-06 0:43 Stephen Rothwell
2019-04-29 23:49 Stephen Rothwell
2018-03-26 22:10 Stephen Rothwell
2018-03-27 7:55 ` Shawn Guo
2018-03-27 7:59 ` Arnd Bergmann
2017-10-30 11:58 Mark Brown
2015-06-01 0:54 Stephen Rothwell
2015-05-21 0:58 Stephen Rothwell
2015-01-13 0:16 Stephen Rothwell
2015-01-13 13:18 ` Arnd Bergmann
2015-01-13 20:29 ` Stephen Rothwell
2014-03-03 1:58 Stephen Rothwell
2014-01-05 23:42 Stephen Rothwell
2014-01-05 23:38 Stephen Rothwell
2013-06-19 6:24 Stephen Rothwell
2013-06-03 5:41 Stephen Rothwell
2013-04-10 7:33 Stephen Rothwell
2013-04-02 6:57 Stephen Rothwell
2013-04-02 6:55 Stephen Rothwell
2013-03-22 4:09 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=20140220114242.b3ce4d77b677544d2feebd3e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=b20788@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=shawn.guo@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 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).