Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9670ccb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

ARM: debug-ll: Add support for r7s9210 



Enable low-level debugging support for RZ/A2M (r7s9210).

The RZA2MEVB board uses either SCIF2 (SDRAM enabled) or SCIF4 (HyperRAM
only) for the serial console.

Note that "SCIFA" serial ports on RZ/A2 SoCs use a compressed register
layout, hence add support for that to renesas-scif.S.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 5f9e832c

arch/arm/Kconfig.debug

+19 −1
Original line number Diff line number Diff line
@@ -924,6 +924,20 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  via SCIF2 on Renesas RZ/A1H (R7S72100).



	config DEBUG_R7S9210_SCIF2

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

		depends on ARCH_R7S9210

		help

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

		  via SCIF2 on Renesas RZ/A2M (R7S9210).



	config DEBUG_R7S9210_SCIF4

		bool "Kernel low-level debugging messages via SCIF4 on R7S9210"

		depends on ARCH_R7S9210

		help

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

		  via SCIF4 on Renesas RZ/A2M (R7S9210).



	config DEBUG_RCAR_GEN1_SCIF0

		bool "Kernel low-level debugging messages via SCIF0 on R8A7778"

		depends on ARCH_R8A7778
@@ -1538,6 +1552,8 @@ config DEBUG_LL_INCLUDE 
	default "debug/netx.S" if DEBUG_NETX_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2

	default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF2

	default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF4

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF0
@@ -1668,7 +1684,8 @@ config DEBUG_UART_PHYS 
	default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0

	default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1

	default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4

	default 0xe8008000 if DEBUG_R7S72100_SCIF2

	default 0xe8008000 if DEBUG_R7S72100_SCIF2 || DEBUG_R7S9210_SCIF2

	default 0xe8009000 if DEBUG_R7S9210_SCIF4

	default 0xf0000000 if DEBUG_DIGICOLOR_UA0

	default 0xf0000be0 if ARCH_EBSA110

	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
@@ -1702,6 +1719,7 @@ config DEBUG_UART_PHYS 
		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \

		DEBUG_R7S9210_SCIF2 || DEBUG_R7S9210_SCIF4 || \

		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \

		DEBUG_RCAR_GEN2_SCIF2 || DEBUG_RCAR_GEN2_SCIF4 || \

arch/arm/include/debug/renesas-scif.S

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ 
#define SCIF_PHYS	CONFIG_DEBUG_UART_PHYS

#define SCIF_VIRT	((SCIF_PHYS & 0x00ffffff) | 0xfd000000)



#if CONFIG_DEBUG_UART_PHYS < 0xe6e00000

#if defined(CONFIG_DEBUG_R7S9210_SCIF2) || defined(CONFIG_DEBUG_R7S9210_SCIF4)

/* RZ/A2 SCIFA */

#define FTDR		0x06

#define FSR		0x08

#elif CONFIG_DEBUG_UART_PHYS < 0xe6e00000

/* SCIFA */

#define FTDR		0x20

#define FSR		0x14