Commit 9fb71bc0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-cleanup2-for-v4.1' of... 

Merge tag 'renesas-soc-cleanup2-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Second Round of Renesas ARM Based SoC Cleanup for v4.1" into next/cleanup:

* Remove restart callback from r8a7740 SoC
* Remove unnecessary check on always set CONFIG_COMMON_CLK from
  shared R-Car Gen2 SoC code
* Remove stray closing parenthesis in SCIF debug description
  for R-Car Gen2 SoC

* tag 'renesas-soc-cleanup2-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7740: Remove restart callback
  ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
  ARM: shmobile: Remove stray closing parenthesis in debug description
parents 63fb2e85 6e5e9c68

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ choice 
		  via SCIF2 on Renesas R-Car H1 (R8A7779).



	config DEBUG_RCAR_GEN2_SCIF0

		bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793)"

		bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793"

		depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793

		help

		  Say Y here if you want kernel low-level debugging support

arch/arm/mach-shmobile/setup-r8a7740.c

+0 −8
Original line number Diff line number Diff line
@@ -842,13 +842,6 @@ static void __init r8a7740_generic_init(void) 
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



#define RESCNT2 IOMEM(0xe6188020)

static void r8a7740_restart(enum reboot_mode mode, const char *cmd)

{

	/* Do soft power on reset */

	writel(1 << 31, RESCNT2);

}



static const char *r8a7740_boards_compat_dt[] __initdata = {

	"renesas,r8a7740",

	NULL,
@@ -861,7 +854,6 @@ DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)") 
	.init_machine	= r8a7740_generic_init,

	.init_late	= shmobile_init_late,

	.dt_compat	= r8a7740_boards_compat_dt,

	.restart	= r8a7740_restart,

MACHINE_END



#endif /* CONFIG_USE_OF */

arch/arm/mach-shmobile/setup-rcar-gen2.c

+0 −4
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ u32 rcar_gen2_read_mode_pins(void) 


void __init rcar_gen2_timer_init(void)

{

#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK)

	u32 mode = rcar_gen2_read_mode_pins();

#endif

#ifdef CONFIG_ARM_ARCH_TIMER

	void __iomem *base;

	int extal_mhz = 0;
@@ -128,9 +126,7 @@ void __init rcar_gen2_timer_init(void) 
	iounmap(base);

#endif /* CONFIG_ARM_ARCH_TIMER */



#ifdef CONFIG_COMMON_CLK

	rcar_gen2_clocks_init(mode);

#endif

#ifdef CONFIG_ARCH_SHMOBILE_MULTI

	clocksource_of_init();

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE