All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support
@ 2015-05-19 22:03 ` Stefan Agner
  0 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: arnd
  Cc: olof, shawn.guo, kernel, jason, marc.zyngier, linux,
	u.kleine-koenig, mcoquelin.stm32, linux-arm-kernel, linux-kernel,
	Stefan Agner

This is the soc part of the splitted patchset which enables Cortex-M4
support on Vybrid, as discussed in the thread of patchset v7.

Changes since v7:
- Split version for arm-soc
- Default to debug/uncompress.h for ARM_SINGLE_ARMV7M initially
- Drop EFM32 conversion (will be part of a follow-up patch)

Stefan Agner (3):
  ARM: unify MMU/!MMU addruart calls
  ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms
  ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC

 Documentation/devicetree/bindings/arm/fsl.txt |  3 +++
 arch/arm/Kconfig                              | 13 +++++++++
 arch/arm/Kconfig.debug                        |  5 ++--
 arch/arm/include/debug/efm32.S                |  2 +-
 arch/arm/kernel/debug.S                       |  2 +-
 arch/arm/mach-imx/Kconfig                     | 38 +++++++++++++++------------
 arch/arm/mach-imx/Makefile.boot               |  0
 arch/arm/mach-imx/mach-vf610.c                |  1 +
 8 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 arch/arm/mach-imx/Makefile.boot

-- 
2.4.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support
@ 2015-05-19 22:03 ` Stefan Agner
  0 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: linux-arm-kernel

This is the soc part of the splitted patchset which enables Cortex-M4
support on Vybrid, as discussed in the thread of patchset v7.

Changes since v7:
- Split version for arm-soc
- Default to debug/uncompress.h for ARM_SINGLE_ARMV7M initially
- Drop EFM32 conversion (will be part of a follow-up patch)

Stefan Agner (3):
  ARM: unify MMU/!MMU addruart calls
  ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms
  ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC

 Documentation/devicetree/bindings/arm/fsl.txt |  3 +++
 arch/arm/Kconfig                              | 13 +++++++++
 arch/arm/Kconfig.debug                        |  5 ++--
 arch/arm/include/debug/efm32.S                |  2 +-
 arch/arm/kernel/debug.S                       |  2 +-
 arch/arm/mach-imx/Kconfig                     | 38 +++++++++++++++------------
 arch/arm/mach-imx/Makefile.boot               |  0
 arch/arm/mach-imx/mach-vf610.c                |  1 +
 8 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 arch/arm/mach-imx/Makefile.boot

-- 
2.4.1

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH soc v8 1/3] ARM: unify MMU/!MMU addruart calls
  2015-05-19 22:03 ` Stefan Agner
@ 2015-05-19 22:03   ` Stefan Agner
  -1 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: arnd
  Cc: olof, shawn.guo, kernel, jason, marc.zyngier, linux,
	u.kleine-koenig, mcoquelin.stm32, linux-arm-kernel, linux-kernel,
	Stefan Agner

Remove the needless differences between MMU/!MMU addruart calls.
This allows to use the same addruart macro on SoC level. Useful
for SoC consisting of multiple CPUs with and without MMU such as
Freescale Vybrid.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/include/debug/efm32.S | 2 +-
 arch/arm/kernel/debug.S        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/debug/efm32.S b/arch/arm/include/debug/efm32.S
index 2265a19..660fa1e 100644
--- a/arch/arm/include/debug/efm32.S
+++ b/arch/arm/include/debug/efm32.S
@@ -16,7 +16,7 @@
 
 #define	UARTn_TXDATA		0x0034
 
-		.macro	addruart, rx, tmp
+		.macro	addruart, rx, tmp, tmp2
 		ldr	\rx, =(CONFIG_DEBUG_UART_PHYS)
 
 		/*
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 78c91b5..ea9646c 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -35,7 +35,7 @@
 
 #else /* !CONFIG_MMU */
 		.macro	addruart_current, rx, tmp1, tmp2
-		addruart	\rx, \tmp1
+		addruart	\rx, \tmp1, \tmp2
 		.endm
 
 #endif /* CONFIG_MMU */
-- 
2.4.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH soc v8 1/3] ARM: unify MMU/!MMU addruart calls
@ 2015-05-19 22:03   ` Stefan Agner
  0 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: linux-arm-kernel

Remove the needless differences between MMU/!MMU addruart calls.
This allows to use the same addruart macro on SoC level. Useful
for SoC consisting of multiple CPUs with and without MMU such as
Freescale Vybrid.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/include/debug/efm32.S | 2 +-
 arch/arm/kernel/debug.S        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/debug/efm32.S b/arch/arm/include/debug/efm32.S
index 2265a19..660fa1e 100644
--- a/arch/arm/include/debug/efm32.S
+++ b/arch/arm/include/debug/efm32.S
@@ -16,7 +16,7 @@
 
 #define	UARTn_TXDATA		0x0034
 
-		.macro	addruart, rx, tmp
+		.macro	addruart, rx, tmp, tmp2
 		ldr	\rx, =(CONFIG_DEBUG_UART_PHYS)
 
 		/*
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 78c91b5..ea9646c 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -35,7 +35,7 @@
 
 #else /* !CONFIG_MMU */
 		.macro	addruart_current, rx, tmp1, tmp2
-		addruart	\rx, \tmp1
+		addruart	\rx, \tmp1, \tmp2
 		.endm
 
 #endif /* CONFIG_MMU */
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH soc v8 2/3] ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms
  2015-05-19 22:03 ` Stefan Agner
@ 2015-05-19 22:03   ` Stefan Agner
  -1 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: arnd
  Cc: olof, shawn.guo, kernel, jason, marc.zyngier, linux,
	u.kleine-koenig, mcoquelin.stm32, linux-arm-kernel, linux-kernel,
	Stefan Agner

This introduces a new top level config symbol ARM_SINGLE_ARMV7M
for non-MMU, ARMv7-M platforms. It also support multiple ARMv7-M
platforms in one kernel image since the cores share the same
basic memory layout and interrupt controller. However, this works
only if the combined platforms also have a similar (main) memory
layout.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/Kconfig       | 13 +++++++++++++
 arch/arm/Kconfig.debug |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 80a2a14..75920ed 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -329,6 +329,19 @@ config ARCH_MULTIPLATFORM
 	select SPARSE_IRQ
 	select USE_OF
 
+config ARM_SINGLE_ARMV7M
+	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
+	depends on !MMU
+	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select ARM_NVIC
+	select CLKSRC_OF
+	select COMMON_CLK
+	select CPU_V7M
+	select GENERIC_CLOCKEVENTS
+	select NO_IOPORT_MAP
+	select SPARSE_IRQ
+	select USE_OF
+
 config ARCH_REALVIEW
 	bool "ARM Ltd. RealView family"
 	select ARCH_WANT_OPTIONAL_GPIOLIB
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 1515cb6..8478be2 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1571,7 +1571,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 
 config DEBUG_UNCOMPRESS
 	bool
-	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG
+	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
 	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help
@@ -1589,7 +1589,8 @@ config UNCOMPRESS_INCLUDE
 	string
 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
 					PLAT_SAMSUNG || ARCH_EFM32 || \
-					ARCH_SHMOBILE_LEGACY || ARCH_LPC18XX
+					ARCH_SHMOBILE_LEGACY || \
+					ARCH_LPC18XX || ARM_SINGLE_ARMV7M
 	default "mach/uncompress.h"
 
 config EARLY_PRINTK
-- 
2.4.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH soc v8 2/3] ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms
@ 2015-05-19 22:03   ` Stefan Agner
  0 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: linux-arm-kernel

This introduces a new top level config symbol ARM_SINGLE_ARMV7M
for non-MMU, ARMv7-M platforms. It also support multiple ARMv7-M
platforms in one kernel image since the cores share the same
basic memory layout and interrupt controller. However, this works
only if the combined platforms also have a similar (main) memory
layout.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/Kconfig       | 13 +++++++++++++
 arch/arm/Kconfig.debug |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 80a2a14..75920ed 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -329,6 +329,19 @@ config ARCH_MULTIPLATFORM
 	select SPARSE_IRQ
 	select USE_OF
 
+config ARM_SINGLE_ARMV7M
+	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
+	depends on !MMU
+	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select ARM_NVIC
+	select CLKSRC_OF
+	select COMMON_CLK
+	select CPU_V7M
+	select GENERIC_CLOCKEVENTS
+	select NO_IOPORT_MAP
+	select SPARSE_IRQ
+	select USE_OF
+
 config ARCH_REALVIEW
 	bool "ARM Ltd. RealView family"
 	select ARCH_WANT_OPTIONAL_GPIOLIB
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 1515cb6..8478be2 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1571,7 +1571,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 
 config DEBUG_UNCOMPRESS
 	bool
-	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG
+	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
 	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help
@@ -1589,7 +1589,8 @@ config UNCOMPRESS_INCLUDE
 	string
 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
 					PLAT_SAMSUNG || ARCH_EFM32 || \
-					ARCH_SHMOBILE_LEGACY || ARCH_LPC18XX
+					ARCH_SHMOBILE_LEGACY || \
+					ARCH_LPC18XX || ARM_SINGLE_ARMV7M
 	default "mach/uncompress.h"
 
 config EARLY_PRINTK
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH soc v8 3/3] ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC
  2015-05-19 22:03 ` Stefan Agner
@ 2015-05-19 22:03   ` Stefan Agner
  -1 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: arnd
  Cc: olof, shawn.guo, kernel, jason, marc.zyngier, linux,
	u.kleine-koenig, mcoquelin.stm32, linux-arm-kernel, linux-kernel,
	Stefan Agner

This patch allows to build the Kernel for Vybrid (VF6xx) SoC
when ARMv7-M CPU is selected. The resulting image runs on the
secondary Cortex-M4 core. This core has equally access to all
peripherals as the main Cortex-A5 core. However, there is no
resource control mechanism, hence when both cores are used
simultaneously, orthogonal device tree's are required.

The boot CPU is dependent on the SoC variant. The available
boards use mostly variants where the Cortex-A5 is the primary
and hence the boot CPU. Booting the secondary Cortex-M4 CPU
needs SoC specific registers written. There is no in kernel
support for this right now, a external userspace utility
called "m4boot" can be used to boot the kernel:

m4boot xipImage initramfs.cpio.lzo vf610m4-colibri.dtb

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 Documentation/devicetree/bindings/arm/fsl.txt |  3 +++
 arch/arm/mach-imx/Kconfig                     | 38 +++++++++++++++------------
 arch/arm/mach-imx/Makefile.boot               |  0
 arch/arm/mach-imx/mach-vf610.c                |  1 +
 4 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 arch/arm/mach-imx/Makefile.boot

diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index a5462b6..2a3ba73 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -81,12 +81,15 @@ Freescale Vybrid Platform Device Tree Bindings
 For the Vybrid SoC familiy all variants with DDR controller are supported,
 which is the VF5xx and VF6xx series. Out of historical reasons, in most
 places the kernel uses vf610 to refer to the whole familiy.
+The compatible string "fsl,vf610m4" is used for the secondary Cortex-M4
+core support.
 
 Required root node compatible property (one of them):
     - compatible = "fsl,vf500";
     - compatible = "fsl,vf510";
     - compatible = "fsl,vf600";
     - compatible = "fsl,vf610";
+    - compatible = "fsl,vf610m4";
 
 Freescale LS1021A Platform Device Tree Bindings
 ------------------------------------------------
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 3a3d3e9..2e3c458 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,5 @@
 menuconfig ARCH_MXC
-	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
+	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_CPU_SUSPEND if PM
 	select CLKSRC_MMIO
@@ -496,10 +496,10 @@ config MACH_VPR200
 
 endif
 
-if ARCH_MULTI_V5
-
 comment "Device tree only"
 
+if ARCH_MULTI_V5
+
 config SOC_IMX25
 	bool "i.MX25 support"
 	select ARCH_MXC_IOMUX_V3
@@ -512,7 +512,7 @@ endif
 
 if ARCH_MULTI_V7
 
-comment "Device tree only"
+comment "Cortex-A platforms"
 
 config SOC_IMX5
 	bool
@@ -582,10 +582,24 @@ config SOC_IMX6SX
 	help
 	  This enables support for Freescale i.MX6 SoloX processor.
 
+config SOC_LS1021A
+	bool "Freescale LS1021A support"
+	select ARM_GIC
+	select HAVE_ARM_ARCH_TIMER
+	select PCI_DOMAINS if PCI
+	select ZONE_DMA if ARM_LPAE
+	help
+	  This enables support for Freescale LS1021A processor.
+
+endif
+
+comment "Cortex-A/Cortex-M asymmetric multiprocessing platforms"
+
+if ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
+
 config SOC_VF610
 	bool "Vybrid Family VF610 support"
-	select IRQ_DOMAIN_HIERARCHY
-	select ARM_GIC
+	select ARM_GIC if ARCH_MULTI_V7
 	select PINCTRL_VF610
 	select PL310_ERRATA_769419 if CACHE_L2X0
 	select SMP_ON_UP if SMP
@@ -599,7 +613,7 @@ choice
 	default VF_USE_ARM_GLOBAL_TIMER
 
 	config VF_USE_ARM_GLOBAL_TIMER
-		bool "Use ARM Global Timer"
+		bool "Use ARM Global Timer" if ARCH_MULTI_V7
 		select ARM_GLOBAL_TIMER
 		select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 		help
@@ -613,16 +627,6 @@ choice
 
 endchoice
 
-config SOC_LS1021A
-	bool "Freescale LS1021A support"
-	select ARM_GIC
-	select HAVE_ARM_ARCH_TIMER
-	select PCI_DOMAINS if PCI
-	select ZONE_DMA if ARM_LPAE
-
-	help
-	  This enables support for Freescale LS1021A processor.
-
 endif
 
 source "arch/arm/mach-imx/devices/Kconfig"
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
new file mode 100644
index 0000000..e69de29
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c
index 2e7c75b..b20f6c1 100644
--- a/arch/arm/mach-imx/mach-vf610.c
+++ b/arch/arm/mach-imx/mach-vf610.c
@@ -17,6 +17,7 @@ static const char * const vf610_dt_compat[] __initconst = {
 	"fsl,vf510",
 	"fsl,vf600",
 	"fsl,vf610",
+	"fsl,vf610m4",
 	NULL,
 };
 
-- 
2.4.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH soc v8 3/3] ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC
@ 2015-05-19 22:03   ` Stefan Agner
  0 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:03 UTC (permalink / raw)
  To: linux-arm-kernel

This patch allows to build the Kernel for Vybrid (VF6xx) SoC
when ARMv7-M CPU is selected. The resulting image runs on the
secondary Cortex-M4 core. This core has equally access to all
peripherals as the main Cortex-A5 core. However, there is no
resource control mechanism, hence when both cores are used
simultaneously, orthogonal device tree's are required.

The boot CPU is dependent on the SoC variant. The available
boards use mostly variants where the Cortex-A5 is the primary
and hence the boot CPU. Booting the secondary Cortex-M4 CPU
needs SoC specific registers written. There is no in kernel
support for this right now, a external userspace utility
called "m4boot" can be used to boot the kernel:

m4boot xipImage initramfs.cpio.lzo vf610m4-colibri.dtb

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 Documentation/devicetree/bindings/arm/fsl.txt |  3 +++
 arch/arm/mach-imx/Kconfig                     | 38 +++++++++++++++------------
 arch/arm/mach-imx/Makefile.boot               |  0
 arch/arm/mach-imx/mach-vf610.c                |  1 +
 4 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 arch/arm/mach-imx/Makefile.boot

diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index a5462b6..2a3ba73 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -81,12 +81,15 @@ Freescale Vybrid Platform Device Tree Bindings
 For the Vybrid SoC familiy all variants with DDR controller are supported,
 which is the VF5xx and VF6xx series. Out of historical reasons, in most
 places the kernel uses vf610 to refer to the whole familiy.
+The compatible string "fsl,vf610m4" is used for the secondary Cortex-M4
+core support.
 
 Required root node compatible property (one of them):
     - compatible = "fsl,vf500";
     - compatible = "fsl,vf510";
     - compatible = "fsl,vf600";
     - compatible = "fsl,vf610";
+    - compatible = "fsl,vf610m4";
 
 Freescale LS1021A Platform Device Tree Bindings
 ------------------------------------------------
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 3a3d3e9..2e3c458 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,5 @@
 menuconfig ARCH_MXC
-	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
+	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_CPU_SUSPEND if PM
 	select CLKSRC_MMIO
@@ -496,10 +496,10 @@ config MACH_VPR200
 
 endif
 
-if ARCH_MULTI_V5
-
 comment "Device tree only"
 
+if ARCH_MULTI_V5
+
 config SOC_IMX25
 	bool "i.MX25 support"
 	select ARCH_MXC_IOMUX_V3
@@ -512,7 +512,7 @@ endif
 
 if ARCH_MULTI_V7
 
-comment "Device tree only"
+comment "Cortex-A platforms"
 
 config SOC_IMX5
 	bool
@@ -582,10 +582,24 @@ config SOC_IMX6SX
 	help
 	  This enables support for Freescale i.MX6 SoloX processor.
 
+config SOC_LS1021A
+	bool "Freescale LS1021A support"
+	select ARM_GIC
+	select HAVE_ARM_ARCH_TIMER
+	select PCI_DOMAINS if PCI
+	select ZONE_DMA if ARM_LPAE
+	help
+	  This enables support for Freescale LS1021A processor.
+
+endif
+
+comment "Cortex-A/Cortex-M asymmetric multiprocessing platforms"
+
+if ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
+
 config SOC_VF610
 	bool "Vybrid Family VF610 support"
-	select IRQ_DOMAIN_HIERARCHY
-	select ARM_GIC
+	select ARM_GIC if ARCH_MULTI_V7
 	select PINCTRL_VF610
 	select PL310_ERRATA_769419 if CACHE_L2X0
 	select SMP_ON_UP if SMP
@@ -599,7 +613,7 @@ choice
 	default VF_USE_ARM_GLOBAL_TIMER
 
 	config VF_USE_ARM_GLOBAL_TIMER
-		bool "Use ARM Global Timer"
+		bool "Use ARM Global Timer" if ARCH_MULTI_V7
 		select ARM_GLOBAL_TIMER
 		select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 		help
@@ -613,16 +627,6 @@ choice
 
 endchoice
 
-config SOC_LS1021A
-	bool "Freescale LS1021A support"
-	select ARM_GIC
-	select HAVE_ARM_ARCH_TIMER
-	select PCI_DOMAINS if PCI
-	select ZONE_DMA if ARM_LPAE
-
-	help
-	  This enables support for Freescale LS1021A processor.
-
 endif
 
 source "arch/arm/mach-imx/devices/Kconfig"
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
new file mode 100644
index 0000000..e69de29
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c
index 2e7c75b..b20f6c1 100644
--- a/arch/arm/mach-imx/mach-vf610.c
+++ b/arch/arm/mach-imx/mach-vf610.c
@@ -17,6 +17,7 @@ static const char * const vf610_dt_compat[] __initconst = {
 	"fsl,vf510",
 	"fsl,vf600",
 	"fsl,vf610",
+	"fsl,vf610m4",
 	NULL,
 };
 
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support
  2015-05-19 22:03 ` Stefan Agner
@ 2015-05-19 22:42   ` Stefan Agner
  -1 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:42 UTC (permalink / raw)
  To: arnd
  Cc: olof, shawn.guo, kernel, jason, marc.zyngier, linux,
	u.kleine-koenig, mcoquelin.stm32, linux-arm-kernel, linux-kernel

On 2015-05-20 00:03, Stefan Agner wrote:
> This is the soc part of the splitted patchset which enables Cortex-M4
> support on Vybrid, as discussed in the thread of patchset v7.

Arnd, forgot to mention that this depends on the irqchip changes merged
by Thomas, see
https://lkml.org/lkml/2015/5/19/204

--
Stefan

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support
@ 2015-05-19 22:42   ` Stefan Agner
  0 siblings, 0 replies; 12+ messages in thread
From: Stefan Agner @ 2015-05-19 22:42 UTC (permalink / raw)
  To: linux-arm-kernel

On 2015-05-20 00:03, Stefan Agner wrote:
> This is the soc part of the splitted patchset which enables Cortex-M4
> support on Vybrid, as discussed in the thread of patchset v7.

Arnd, forgot to mention that this depends on the irqchip changes merged
by Thomas, see
https://lkml.org/lkml/2015/5/19/204

--
Stefan

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support
  2015-05-19 22:42   ` Stefan Agner
@ 2015-05-20 21:29     ` Arnd Bergmann
  -1 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2015-05-20 21:29 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Stefan Agner, mcoquelin.stm32, linux, jason, marc.zyngier,
	linux-kernel, kernel, u.kleine-koenig, olof, shawn.guo

On Wednesday 20 May 2015 00:42:21 Stefan Agner wrote:
> On 2015-05-20 00:03, Stefan Agner wrote:
> > This is the soc part of the splitted patchset which enables Cortex-M4
> > support on Vybrid, as discussed in the thread of patchset v7.
> 
> Arnd, forgot to mention that this depends on the irqchip changes merged
> by Thomas, see
> https://lkml.org/lkml/2015/5/19/204

I've pulled that branch into next/soc now and merged your patches on top.
Great job, thanks a lot!

Can you take a look at the branch now and see what needs to be done
for the other three Cortex-M based platforms, to get them to use
ARM_SINGLE_ARMV7M?

	Arnd

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support
@ 2015-05-20 21:29     ` Arnd Bergmann
  0 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2015-05-20 21:29 UTC (permalink / raw)
  To: linux-arm-kernel

On Wednesday 20 May 2015 00:42:21 Stefan Agner wrote:
> On 2015-05-20 00:03, Stefan Agner wrote:
> > This is the soc part of the splitted patchset which enables Cortex-M4
> > support on Vybrid, as discussed in the thread of patchset v7.
> 
> Arnd, forgot to mention that this depends on the irqchip changes merged
> by Thomas, see
> https://lkml.org/lkml/2015/5/19/204

I've pulled that branch into next/soc now and merged your patches on top.
Great job, thanks a lot!

Can you take a look at the branch now and see what needs to be done
for the other three Cortex-M based platforms, to get them to use
ARM_SINGLE_ARMV7M?

	Arnd

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2015-05-20 21:29 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-19 22:03 [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support Stefan Agner
2015-05-19 22:03 ` Stefan Agner
2015-05-19 22:03 ` [PATCH soc v8 1/3] ARM: unify MMU/!MMU addruart calls Stefan Agner
2015-05-19 22:03   ` Stefan Agner
2015-05-19 22:03 ` [PATCH soc v8 2/3] ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms Stefan Agner
2015-05-19 22:03   ` Stefan Agner
2015-05-19 22:03 ` [PATCH soc v8 3/3] ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC Stefan Agner
2015-05-19 22:03   ` Stefan Agner
2015-05-19 22:42 ` [PATCH soc v8 0/3] ARM: vf610m4: Add Vybrid Cortex-M4 support Stefan Agner
2015-05-19 22:42   ` Stefan Agner
2015-05-20 21:29   ` Arnd Bergmann
2015-05-20 21:29     ` Arnd Bergmann

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.