Merge tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

From Simon Horman:
Renesas ARM based SoC multiplatform updates for v3.12

Move Renesas ARM based SoCs a little closer to using
multiplatform by adding ARCH_SHMOBILE_MULTI and only
building clocks when COMMON_CLK=n.

* tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration
  ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI
  ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI
  ARM: shmobile: Only build clocks when COMMON_CLK=n

Signed-off-by: Olof Johansson <olof@lixom.net>

6 files changed, 77 insertions, 16 deletions

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c0ac0f5e5e5c..d1f717c59e70 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -190,6 +190,7 @@ machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
 machine-$(CONFIG_ARCH_SA1100)           += sa1100
 machine-$(CONFIG_ARCH_SHARK)            += shark
 machine-$(CONFIG_ARCH_SHMOBILE)         += shmobile
+machine-$(CONFIG_ARCH_SHMOBILE_MULTI)   += shmobile
 machine-$(CONFIG_ARCH_TEGRA)            += tegra
 machine-$(CONFIG_ARCH_U300)             += u300
 machine-$(CONFIG_ARCH_U8500)            += ux500
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index af19e38f8e97..f3861de9fd4e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -193,6 +193,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
         sh73a0-kzm9g-reference.dtb \
         r8a73a4-ape6evm.dtb \
         sh7372-mackerel.dtb
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
         socfpga_vt.dtb
 dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 7c5034aa1fe3..cdefd7dcca79 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,3 +1,41 @@
+config ARCH_SHMOBILE_MULTI
+        bool "SH-Mobile Series" if ARCH_MULTI_V7
+        depends on MMU
+        select CPU_V7
+        select GENERIC_CLOCKEVENTS
+        select HAVE_ARM_SCU if SMP
+        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_SMP
+        select ARM_GIC
+        select MIGHT_HAVE_CACHE_L2X0
+        select NO_IOPORT
+        select PINCTRL
+        select ARCH_REQUIRE_GPIOLIB
+        select CLKDEV_LOOKUP
+
+if ARCH_SHMOBILE_MULTI
+
+comment "SH-Mobile System Type"
+
+config ARCH_EMEV2
+        bool "Emma Mobile EV2"
+
+comment "SH-Mobile Board Type"
+
+config MACH_KZM9D_REFERENCE
+        bool "KZM9D board - Reference Device Tree Implementation"
+        depends on ARCH_EMEV2
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        ---help---
+           Use reference implementation of KZM9D board support
+           which makes a greater use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
+comment "SH-Mobile System Configuration"
+endif
+
 if ARCH_SHMOBILE
 
 comment "SH-Mobile System Type"
@@ -198,6 +236,15 @@ config CPU_HAS_INTEVT
         bool
         default y
 
+config SH_CLK_CPG
+        bool
+
+source "drivers/sh/Kconfig"
+
+endif
+
+if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+
 menu "Timer and clock configuration"
 
 config SHMOBILE_TIMER_HZ
@@ -232,9 +279,4 @@ config EM_TIMER_STI
 
 endmenu
 
-config SH_CLK_CPG
-        bool
-
-source "drivers/sh/Kconfig"
-
 endif
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index e8d0a2c904a0..b150c4508237 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -2,18 +2,33 @@
 # Makefile for the linux kernel.
 #
 
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
+
 # 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
diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
index a7b28b24ab38..8f8bb2fab076 100644
--- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
@@ -26,7 +26,8 @@
 
 static void __init kzm9d_add_standard_devices(void)
 {
-        emev2_clock_init();
+        if (!IS_ENABLED(CONFIG_COMMON_CLK))
+                emev2_clock_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 19980be7d6a9..1553af8e04ff 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -175,7 +175,8 @@ static struct resource pmu_resources[] = {
 
 void __init emev2_add_standard_devices(void)
 {
-        emev2_clock_init();
+        if (!IS_ENABLED(CONFIG_COMMON_CLK))
+                emev2_clock_init();
 
         emev2_register_uart(0);
         emev2_register_uart(1);