Commit f6b2dae7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-for-v4.9' of... 

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

Pull "Renesas ARM Based SoC Updates for v4.9" from Simon Horman:

Clean-up:
* Only use smp_init when SMP is selected

Enablement:
* Add debug-ll support for r8a7992

* tag 'renesas-soc-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: only use smp_init when SMP is selected
  ARM: shmobile: r8a7790: only use smp_init when SMP is selected
  ARM: debug-ll: Add support for r8a7992
parents ea58e97d 82acc694

arch/arm/Kconfig.debug

+4 −4
Original line number Diff line number Diff line
@@ -862,12 +862,12 @@ 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"

		depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793

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

		depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793

		help

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

		  via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), or

		  M2-N (R8A7793).

		  via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), V2H

		  (R8A7792), or M2-N (R8A7793).



	config DEBUG_RCAR_GEN2_SCIF2

		bool "Kernel low-level debugging messages via SCIF2 on R8A7794"

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = { 
};



DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")

	.smp_init	= shmobile_smp_init_fallback_ops,

	.smp_init	= smp_init_ops(shmobile_smp_init_fallback_ops),

	.smp		= smp_ops(r8a7790_smp_ops),

	.init_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static const char *const r8a7791_boards_compat_dt[] __initconst = { 
};



DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")

	.smp_init	= shmobile_smp_init_fallback_ops,

	.smp_init	= smp_init_ops(shmobile_smp_init_fallback_ops),

	.smp		= smp_ops(r8a7791_smp_ops),

	.init_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

CRA Git | Maintained and supported by SUSTech CRA and CCSE