From: Olof Johansson <olof@lixom.net>
Date: Thu, 6 Aug 2015 08:09:08 +0000 (+0200)
Subject: Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff20775d189cf8f36684c88f6f95e00d21bc783c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git./linux/kernel/git/horms/renesas into next/cleanup

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>
---

ff20775d189cf8f36684c88f6f95e00d21bc783c
diff --cc arch/arm/boot/dts/Makefile
index 14fc8f1fe2d8,2e3fabad0f7a..d10eea88cb7d
--- a/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 bfe92bc96a47,1fe775c7e004..26505d4efa80
--- a/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 726c219e5b13,039445ce1ed8..29687a7a0a94
--- a/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 14cdfc0ed075,7e7e0f47848c..a489fe9a76cd
--- a/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 7a457eacd567,c18d85a96c67..7ca891999547
--- a/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 void __init r8a7779_init_time(void)
+ {
+ 	r8a7779_clocks_init(r8a7779_read_mode_pins());
+ 	clocksource_of_init();
+ }
+ 
 -static const char *r8a7779_compat_dt[] __initdata = {
 +static const char *const r8a7779_compat_dt[] __initconst = {
  	"renesas,r8a7779",
  	NULL,
  };
diff --cc arch/arm/mach-shmobile/smp-r8a7779.c
index 9122216df060,6756ada34bc0..353562b8a5ee
--- a/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);