* [PATCH 1/3] ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff
@ 2014-02-27 8:42 Shawn Guo
2014-02-27 8:42 ` [PATCH 2/3] ARM: imx6: rename pm-imx6q.c to pm-imx6.c Shawn Guo
2014-02-27 8:42 ` [PATCH 3/3] ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Shawn Guo @ 2014-02-27 8:42 UTC (permalink / raw)
To: linux-arm-kernel
The i.MX6 SoCs have something in common, so let's introduce
CONFIG_SOC_IMX6 for those stuff.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/Kconfig | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index d75d168..e45062d 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -786,46 +786,39 @@ config SOC_IMX53
help
This enables support for Freescale i.MX53 processor.
-config SOC_IMX6Q
- bool "i.MX6 Quad/DualLite support"
+config SOC_IMX6
+ bool
select ARM_ERRATA_754322
- select ARM_ERRATA_764369 if SMP
select ARM_ERRATA_775420
select ARM_GIC
select CPU_V7
- select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if SMP
select HAVE_IMX_ANATOP
select HAVE_IMX_GPC
select HAVE_IMX_MMDC
select HAVE_IMX_SRC
- select HAVE_SMP
select MFD_SYSCON
- select MIGHT_HAVE_PCI
- select PCI_DOMAINS if PCI
- select PINCTRL_IMX6Q
select PL310_ERRATA_588369 if CACHE_PL310
select PL310_ERRATA_727915 if CACHE_PL310
select PL310_ERRATA_769419 if CACHE_PL310
+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.
config SOC_IMX6SL
bool "i.MX6 SoloLite support"
- select ARM_ERRATA_754322
- select ARM_ERRATA_775420
- select ARM_GIC
- select CPU_V7
- select HAVE_IMX_ANATOP
- select HAVE_IMX_GPC
- select HAVE_IMX_MMDC
- select HAVE_IMX_SRC
- select MFD_SYSCON
select PINCTRL_IMX6SL
- select PL310_ERRATA_588369 if CACHE_PL310
- select PL310_ERRATA_727915 if CACHE_PL310
- select PL310_ERRATA_769419 if CACHE_PL310
+ select SOC_IMX6
help
This enables support for Freescale i.MX6 SoloLite processor.
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] ARM: imx6: rename pm-imx6q.c to pm-imx6.c
2014-02-27 8:42 [PATCH 1/3] ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff Shawn Guo
@ 2014-02-27 8:42 ` Shawn Guo
2014-02-27 8:42 ` [PATCH 3/3] ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2014-02-27 8:42 UTC (permalink / raw)
To: linux-arm-kernel
The pm-imx6q.c works for all i.MX6 SoCs, so let's rename it to pm-imx6.c
and have the build controlled by option CONFIG_SOC_IMX6.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/Makefile | 4 +---
arch/arm/mach-imx/{pm-imx6q.c => pm-imx6.c} | 0
2 files changed, 1 insertion(+), 3 deletions(-)
rename arch/arm/mach-imx/{pm-imx6q.c => pm-imx6.c} (100%)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 9c776a0..19a6d0e 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -104,9 +104,7 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
obj-$(CONFIG_SUSPEND) += suspend-imx6.o
-obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
-# i.MX6SL reuses i.MX6Q code
-obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o
+obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
# i.MX5 based machines
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6.c
similarity index 100%
rename from arch/arm/mach-imx/pm-imx6q.c
rename to arch/arm/mach-imx/pm-imx6.c
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3] ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6
2014-02-27 8:42 [PATCH 1/3] ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff Shawn Guo
2014-02-27 8:42 ` [PATCH 2/3] ARM: imx6: rename pm-imx6q.c to pm-imx6.c Shawn Guo
@ 2014-02-27 8:42 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2014-02-27 8:42 UTC (permalink / raw)
To: linux-arm-kernel
Even when CONFIG_SUSPEND is enabled, it makes no sense to build
suspend-imx6.o if none of i.MX6 support is built in. Let's build
suspend-imx6.o only when both CONFIG_SUSPEND and CONFIG_SOC_IMX6 are
enabled.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 19a6d0e..f4ed830 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -102,8 +102,10 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
+ifeq ($(CONFIG_SUSPEND),y)
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
-obj-$(CONFIG_SUSPEND) += suspend-imx6.o
+obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
+endif
obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
# i.MX5 based machines
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-27 8:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-27 8:42 [PATCH 1/3] ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff Shawn Guo
2014-02-27 8:42 ` [PATCH 2/3] ARM: imx6: rename pm-imx6q.c to pm-imx6.c Shawn Guo
2014-02-27 8:42 ` [PATCH 3/3] ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 Shawn Guo
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).