Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm...

Renesas ARM Based SoC Marzen Board Removal for v4.3

* Remove legacy r8a7779 SoC code
* Remove legacy marzen board code

* tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: Remove legacy SoC code
  ARM: shmobile: marzen: Remove legacy board code
  ARM: shmobile: r8a7779: Cleanup header file
  ARM: shmobile: marzen-reference: Remove C board code
  ARM: shmobile: r8a7779: Generic SMP ops
  ARM: shmobile: r8a7779: Generic CCF and timer support

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

diff --cc arch/arm/boot/dts/Makefile
index 14fc8f1fe2d8b097164c8fd73419cc6b1bae14f0,2e3fabad0f7a97595d510cdf30cd3f0706868cb4..d10eea88cb7d148b7da13a865c13f8862b6be558
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -501,9 -501,10 +501,10 @@@ dtb-$(CONFIG_ARCH_S5PV210) += 
        s5pv210-smdkv210.dtb \
        s5pv210-torbreck.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
 -      r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \
-       r8a7779-marzen.dtb
++      r8a7779-marzen.dtb \
+       sh73a0-kzm9g.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \

diff --cc arch/arm/mach-shmobile/Kconfig
index bfe92bc96a47eed0a534411f24db28e7c1f048a6,1fe775c7e00403888ce41b4c929835a1462a00d5..26505d4efa807ea89565f96dba04e146caa63c02
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -139,13 -157,14 +132,6 @@@ config MACH_BOCKW_REFERENC
  
           This is intended to aid developers
  
- config MACH_MARZEN
-       bool "MARZEN board"
-       depends on ARCH_R8A7779
 -config MACH_KZM9G
 -      bool "KZM-A9-GT board"
 -      depends on ARCH_SH73A0
--      select ARCH_REQUIRE_GPIOLIB
--      select REGULATOR_FIXED_VOLTAGE if REGULATOR
 -      select SND_SOC_AK4642 if SND_SIMPLE_CARD
--      select USE_OF
--
  comment "Renesas ARM SoCs System Configuration"
  
  config CPU_HAS_INTEVT

diff --cc arch/arm/mach-shmobile/Makefile
index 726c219e5b138547cfdc72f78cfcb81865c3e241,039445ce1ed8b9381af2e9e859edb9fa98d30490..29687a7a0a941dfbea451c5535026c9bd826d8ae
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -20,8 -20,9 +20,7 @@@ obj-$(CONFIG_ARCH_R7S72100)   += setup-r7
  # Clock objects
  ifndef CONFIG_COMMON_CLK
  obj-y                         += clock.o
 -obj-$(CONFIG_ARCH_SH73A0)     += clock-sh73a0.o
 -obj-$(CONFIG_ARCH_R8A7740)    += clock-r8a7740.o
  obj-$(CONFIG_ARCH_R8A7778)    += clock-r8a7778.o
- obj-$(CONFIG_ARCH_R8A7779)    += clock-r8a7779.o
  endif
  
  # CPU reset vector handling objects
@@@ -49,13 -50,12 +48,9 @@@ obj-$(CONFIG_PM_RMOBILE)    += pm-rmobile.
  obj-$(CONFIG_ARCH_RCAR_GEN2)  += pm-rcar-gen2.o
  
  # Board objects
- ifdef CONFIG_ARCH_SHMOBILE_MULTI
- obj-$(CONFIG_MACH_MARZEN)     += board-marzen-reference.o
- else
+ ifndef CONFIG_ARCH_SHMOBILE_MULTI
  obj-$(CONFIG_MACH_BOCKW)      += board-bockw.o
  obj-$(CONFIG_MACH_BOCKW_REFERENCE)    += board-bockw-reference.o
- obj-$(CONFIG_MACH_MARZEN)     += board-marzen.o
 -obj-$(CONFIG_MACH_ARMADILLO800EVA)    += board-armadillo800eva.o
 -obj-$(CONFIG_MACH_KZM9G)      += board-kzm9g.o intc-sh73a0.o
--endif
  
  # Framework support
  obj-$(CONFIG_SMP)             += $(smp-y)

diff --cc arch/arm/mach-shmobile/Makefile.boot
index 14cdfc0ed0755a59a98b55f93e7983a9c0f9afb9,7e7e0f47848cb38765374c92374af4aec0f53092..a489fe9a76cd63f2e469d878838fa3b2f98d88a6
--- 1/arch/arm/mach-shmobile/Makefile.boot
--- 2/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@@ -1,8 -1,9 +1,7 @@@
  # per-board load address for uImage
  loadaddr-y    :=
 -loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
  loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
  loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
- loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
 -loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
  
  __ZRELADDR    := $(sort $(loadaddr-y))
     zreladdr-y   += $(__ZRELADDR)

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
index 7a457eacd5670b1627db3a3d41c1cfcec7ee3ff2,c18d85a96c6754b5a35949e6c4cbbf3bbdf9a416..7ca8919995471bfdf2a6bbccea4224604a2e2c9a
--- 1/arch/arm/mach-shmobile/setup-r8a7779.c
--- 2/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@@ -756,7 -96,13 +96,13 @@@ static u32 __init r8a7779_read_mode_pin
        return mode;
  }
  
 -static const char *r8a7779_compat_dt[] __initdata = {
+ static void __init r8a7779_init_time(void)
+ {
+       r8a7779_clocks_init(r8a7779_read_mode_pins());
+       clocksource_of_init();
+ }
+ 
 +static const char *const r8a7779_compat_dt[] __initconst = {
        "renesas,r8a7779",
        NULL,
  };

diff --cc arch/arm/mach-shmobile/smp-r8a7779.c
index 9122216df060400469ab6eac31dfd3357271b692,6756ada34bc02ede66167386eb34c36050e56700..353562b8a5eeb243f79b990c13f7eee26d9448cd
--- 1/arch/arm/mach-shmobile/smp-r8a7779.c
--- 2/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@@ -56,17 -55,9 +55,9 @@@ static const struct rcar_sysc_ch * cons
        [3] = &r8a7779_ch_cpu3,
  };
  
- #if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM)
- static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29);
- void __init r8a7779_register_twd(void)
- {
-       twd_local_timer_register(&twd_local_timer);
- }
- #endif
- 
  static int r8a7779_platform_cpu_kill(unsigned int cpu)
  {
 -      struct rcar_sysc_ch *ch = NULL;
 +      const struct rcar_sysc_ch *ch = NULL;
        int ret = -EIO;
  
        cpu = cpu_logical_map(cpu);