From: Arnd Bergmann Date: Fri, 21 Nov 2014 12:04:06 +0000 (+0100) Subject: Merge tag 'renesas-soc4-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6febbf472b6f3df1b6a137fe246ac88dcd5b2c0e;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'renesas-soc4-for-v3.19' of git://git./linux/kernel/git/horms/renesas into next/soc Pull "Fourth Round of Renesas ARM Based SoC Updates for v3.19" from Simon Horman: * Add early debugging support using SCIF(A) * tag 'renesas-soc4-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Add early debugging support using SCIF(A) Signed-off-by: Arnd Bergmann --- 6febbf472b6f3df1b6a137fe246ac88dcd5b2c0e diff --cc arch/arm/Kconfig.debug index a52884351e4f,6ac3758f85d8..e4917aebc31f --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@ -1199,8 -1218,13 +1265,14 @@@ config DEBUG_UART_PHY default 0xd4018000 if DEBUG_MMP_UART3 default 0xe0000000 if ARCH_SPEAR13XX default 0xe4007000 if DEBUG_HIP04_UART + default 0xe6c40000 if DEBUG_RMOBILE_SCIFA0 + default 0xe6c50000 if DEBUG_RMOBILE_SCIFA1 + default 0xe6c80000 if DEBUG_RMOBILE_SCIFA4 + default 0xe6e58000 if DEBUG_RCAR_GEN2_SCIF2 + default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0 + default 0xe8008000 if DEBUG_R7S72100_SCIF2 default 0xf0000be0 if ARCH_EBSA110 + default 0xf040ab00 if DEBUG_BRCMSTB_UART default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \ ARCH_ORION5X