ARM: shmobile: ARCH_MULTIPLATFORM for EMEV2 and KZM9D

From: Magnus Damm <[email protected]>

Move shared clock.c file and per-SoC clock-xxx.c files to only build when CONFIG_COMMON_CLK != y.

The regular ARCH_SHMOBILE case with legacy SH clock framework will build just as before with this patch applied, however the case when COMMON_CLK=y will exclude all the clock files.

Signed-off-by Magnus Damm <[email protected]>

---

Changes since V1:
- wrap clock objects in ifndef, thanks Arnd and Laurent!

 arch/arm/mach-shmobile/Makefile |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

arch/arm/mach-shmobile/Makefile +22 -10

@@ -3,17 +3,30 @@
 #
 
 # Common objects
-obj-y				:= timer.o console.o clock.o
+obj-y				:= timer.o console.o
 
 # CPU objects
-obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o
-obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
-obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o clock-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o clock-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o clock-r8a7779.o intc-r8a7779.o
-obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o clock-r8a7790.o
-obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o clock-emev2.o
+obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o intc-sh7372.o
+obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o intc-sh73a0.o
+obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
+obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o intc-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o
+obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o intc-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o
+obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o
+
+# Clock objects
+ifndef CONFIG_COMMON_CLK
+obj-y				+= clock.o
+obj-$(CONFIG_ARCH_SH7372)	+= clock-sh7372.o
+obj-$(CONFIG_ARCH_SH73A0)	+= clock-sh73a0.o
+obj-$(CONFIG_ARCH_R8A73A4)	+= clock-r8a73a4.o
+obj-$(CONFIG_ARCH_R8A7740)	+= clock-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o
+obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7790)	+= clock-r8a7790.o
+obj-$(CONFIG_ARCH_EMEV2)	+= clock-emev2.o
+endif
 
 # SMP objects
 smp-y				:= platsmp.o headsmp.o
--

To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Magnus Damm <[email protected]>

Add ARCH_SHMOBILE_MULTI to mach-shmobile that can be used to enable ARCH_MULTIPLATFORM on selected SoCs and boards.

The headers stay under arch/arm/mach-shmobile/include/mach/ for now, they can and will be migrated independently over time.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/Makefile               |    1 +
 arch/arm/mach-shmobile/Kconfig  |   21 +++++++++++++++++++++
 arch/arm/mach-shmobile/Makefile |    2 ++
 3 files changed, 24 insertions(+)

From: Magnus Damm <[email protected]>

Enable build of EMEV2 and KZM9D DT Reference in case of ARCH_MULTIPLATFORM and ARCH_SHMOBILE_MULTI.

IS_ENABLED() is leaves the clock-emev2.c file out
in case of COMMON_CLK=y.

Signed-off-by Magnus Damm <[email protected]>

---

Changes since V1:
- use IS_ENABLED() instead of weak symbol, thanks Arnd!

 arch/arm/boot/dts/Makefile                     |    1 +
 arch/arm/mach-shmobile/Kconfig                 |   15 +++++++++++++++
 arch/arm/mach-shmobile/board-kzm9d-reference.c |    3 ++-
 arch/arm/mach-shmobile/setup-emev2.c           |    3 ++-
 4 files changed, 20 insertions(+), 2 deletions(-)

From: Magnus Damm <[email protected]>

Move the timer configuration bits to allow use in
case of ARCH_SHMOBILE or ARCH_SHMOBILE_MULTI.

The timers all make use of the regular driver model so they are safe to enable for ARCH_MULTIPLATFORM.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/Kconfig |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

ARM: shmobile: ARCH_MULTIPLATFORM for EMEV2 and KZM9D (v2)

[PATCH v2 01/04] ARM: shmobile: Only build clocks when COMMON_CLK=n [PATCH 02/04] ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI [PATCH v2 03/04] ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI [PATCH 04/04] ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration

This patch set extends mach-shmobile to allow a subset of SoCs and boards to be built for ARCH_MULTIPLATFORM. With this v2 series applied the EMEV2 SoC and the KZM9D board can be built in two ways - either as good old ARCH_SHMOBILE or new ARCH_SHMOBILE_MULTI. The latter requires common clock framework for proper run time operation.

The goal is to over time move all DT reference implementations from ARCH_SHMOBILE to ARCH_SHMOBILE_MULTI. Until CCF is available for a certain SoC it is to me acceptable for a DT reference board to allow build in both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI. The reason for this is to allow incremental development and easy testing during development of CCF for a certain SoC. The KZM9D board is now in this state while it is waiting for common clocks to become ready.

Until CCF is supported for EMEV2 the KZM9D board can be tested with ARCH_SMOBILE_MULTI without clocks using the following prototype:
[PATCH] ARM: shmobile: MULTIPLATFORM KZM9D with no clocks prototype hack

Signed-off-by Magnus Damm <[email protected]>

---

Built on top of renesas-devel-20130717