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,
Rob Herring <robh@kernel.org>,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Mon, 3 Mar 2014 12:58:52 +1100 [thread overview]
Message-ID: <20140303125852.f0f4ebf5af79627aaa3baf5d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/Kconfig between commits ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") and 37dff0825611 ("ARM: imx6:
introduce CONFIG_SOC_IMX6 for i.MX6 common stuff") from the arm-soc tree
and commit f702c0213144 ("ARM: mach-imx: Select CONFIG_SRAM at ARCH_MXC
level") 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/Kconfig
index 41ffd433f709,e45062d41fcb..000000000000
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -1,12 -1,22 +1,15 @@@
config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
+ select ARCH_HAS_CPUFREQ
+ select ARCH_HAS_OPP
select ARCH_REQUIRE_GPIOLIB
select ARM_CPU_SUSPEND if PM
- select ARM_PATCH_PHYS_VIRT
select CLKSRC_MMIO
- select GENERIC_ALLOCATOR
- select COMMON_CLK
- select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP
- select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7
- select MULTI_IRQ_HANDLER
select PINCTRL
+ select PM_OPP if PM
select SOC_BUS
- select SPARSE_IRQ
+ select SRAM
- select USE_OF
help
Support for Freescale MXC/iMX-based family of processors
@@@ -114,10 -124,11 +117,10 @@@ config SOC_IMX3
config SOC_IMX35
bool
select ARCH_MXC_IOMUX_V3
- select CPU_V6K
select HAVE_EPIT
select MXC_AVIC
+ select PINCTRL_IMX35
select SMP_ON_UP if SMP
- select PINCTRL
config SOC_IMX5
bool
@@@ -775,16 -786,12 +777,11 @@@ config SOC_IMX5
help
This enables support for Freescale i.MX53 processor.
- config SOC_IMX6Q
- bool "i.MX6 Quad/DualLite support"
- select ARCH_HAS_CPUFREQ
- select ARCH_HAS_OPP
+ config SOC_IMX6
+ bool
select ARM_ERRATA_754322
- select ARM_ERRATA_764369 if SMP
select ARM_ERRATA_775420
select ARM_GIC
- select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if SMP
- select CPU_V7
select HAVE_IMX_ANATOP
select HAVE_IMX_GPC
select HAVE_IMX_MMDC
@@@ -793,10 -800,17 +790,16 @@@
select PL310_ERRATA_588369 if CACHE_PL310
select PL310_ERRATA_727915 if CACHE_PL310
select PL310_ERRATA_769419 if CACHE_PL310
- select PM_OPP if PM
+
+ config SOC_IMX6Q
+ bool "i.MX6 Quad/DualLite support"
+ select ARM_ERRATA_764369 if SMP
+ select HAVE_ARM_SCU if SMP
+ select HAVE_ARM_TWD if SMP
- select HAVE_SMP
+ select MIGHT_HAVE_PCI
+ select PCI_DOMAINS if PCI
+ select PINCTRL_IMX6Q
+ select SOC_IMX6
help
This enables support for Freescale i.MX6 Quad processor.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-03 1:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 1:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-06 0:43 linux-next: manual merge of the imx-mxs tree with the arm-soc tree 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-02-20 0:42 Stephen Rothwell
2014-02-20 1:30 ` Shawn Guo
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=20140303125852.f0f4ebf5af79627aaa3baf5d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=fabio.estevam@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=robh@kernel.org \
--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).