tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'renesas-arm-soc-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc

Renesas ARM SoC updates for v5.4

- Low-level debugging support for RZ/A2M.

* tag 'renesas-arm-soc-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
ARM: debug-ll: Add support for r7s9210

Link: https://lore.kernel.org/r/20190823123643.18799-3-geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 9e38081e e8606cd4

+24 -2
+19 -1
arch/arm/Kconfig.debug
··· 917 917 Say Y here if you want kernel low-level debugging support 918 918 via SCIF2 on Renesas RZ/A1H (R7S72100). 919 919 920 + config DEBUG_R7S9210_SCIF2 921 + bool "Kernel low-level debugging messages via SCIF2 on R7S9210" 922 + depends on ARCH_R7S9210 923 + help 924 + Say Y here if you want kernel low-level debugging support 925 + via SCIF2 on Renesas RZ/A2M (R7S9210). 926 + 927 + config DEBUG_R7S9210_SCIF4 928 + bool "Kernel low-level debugging messages via SCIF4 on R7S9210" 929 + depends on ARCH_R7S9210 930 + help 931 + Say Y here if you want kernel low-level debugging support 932 + via SCIF4 on Renesas RZ/A2M (R7S9210). 933 + 920 934 config DEBUG_RCAR_GEN1_SCIF0 921 935 bool "Kernel low-level debugging messages via SCIF0 on R8A7778" 922 936 depends on ARCH_R8A7778 ··· 1543 1529 default "debug/msm.S" if DEBUG_QCOM_UARTDM 1544 1530 default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART 1545 1531 default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2 1532 + default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF2 1533 + default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF4 1546 1534 default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0 1547 1535 default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF2 1548 1536 default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF0 ··· 1672 1656 default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0 1673 1657 default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1 1674 1658 default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4 1675 - default 0xe8008000 if DEBUG_R7S72100_SCIF2 1659 + default 0xe8008000 if DEBUG_R7S72100_SCIF2 || DEBUG_R7S9210_SCIF2 1660 + default 0xe8009000 if DEBUG_R7S9210_SCIF4 1676 1661 default 0xf0000000 if DEBUG_DIGICOLOR_UA0 1677 1662 default 0xf0000be0 if ARCH_EBSA110 1678 1663 default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE ··· 1704 1687 DEBUG_LL_UART_EFM32 || \ 1705 1688 DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \ 1706 1689 DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \ 1690 + DEBUG_R7S9210_SCIF2 || DEBUG_R7S9210_SCIF4 || \ 1707 1691 DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \ 1708 1692 DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \ 1709 1693 DEBUG_RCAR_GEN2_SCIF2 || DEBUG_RCAR_GEN2_SCIF4 || \
+5 -1
arch/arm/include/debug/renesas-scif.S
··· 11 11 #define SCIF_PHYS CONFIG_DEBUG_UART_PHYS 12 12 #define SCIF_VIRT ((SCIF_PHYS & 0x00ffffff) | 0xfd000000) 13 13 14 - #if CONFIG_DEBUG_UART_PHYS < 0xe6e00000 14 + #if defined(CONFIG_DEBUG_R7S9210_SCIF2) || defined(CONFIG_DEBUG_R7S9210_SCIF4) 15 + /* RZ/A2 SCIFA */ 16 + #define FTDR 0x06 17 + #define FSR 0x08 18 + #elif CONFIG_DEBUG_UART_PHYS < 0xe6e00000 15 19 /* SCIFA */ 16 20 #define FTDR 0x20 17 21 #define FSR 0x14