GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 19:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: uniphier: remove unused init code for CONFIG_DEBUG_UART

Browse source 
debug_uart_init() is called from spl_board_init(), which is only
compiled for SPL. For U-boot proper, _debug_uart_init() is unreachable,
so dropped by the dead code elimination.

Now that 64-bit SoCs of this SoC family no longer support SPL,
debug-uart-ld20.c is never compiled.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-06-29 02:38:05 +09:00
parent 3b7fc3ff31
commit e3d5d3ac5b
4 changed files with 2 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-uniphier/debug-uart/Makefile
View file

@ -7,8 +7,6 @@ obj-$(CONFIG_ARCH_UNIPHIER_SLD8) += debug-uart-sld8.o
obj-$(CONFIG_ARCH_UNIPHIER_PRO5) += debug-uart-pro5.o obj-$(CONFIG_ARCH_UNIPHIER_PRO5) += debug-uart-pro5.o
obj-$(CONFIG_ARCH_UNIPHIER_PXS2) += debug-uart-pxs2.o obj-$(CONFIG_ARCH_UNIPHIER_PXS2) += debug-uart-pxs2.o
obj-$(CONFIG_ARCH_UNIPHIER_LD6B) += debug-uart-ld6b.o obj-$(CONFIG_ARCH_UNIPHIER_LD6B) += debug-uart-ld6b.o
obj-$(CONFIG_ARCH_UNIPHIER_LD11) += debug-uart-ld20.o
obj-$(CONFIG_ARCH_UNIPHIER_LD20) += debug-uart-ld20.o
endif endif
obj-y += debug-uart.o obj-y += debug-uart.o

34
arch/arm/mach-uniphier/debug-uart/debug-uart-ld20.c
View file

@ -1,34 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <config.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include "../sc64-regs.h"
#include "../sg-regs.h"
#include "debug-uart.h"
#define UNIPHIER_LD20_UART_CLK 58820000
unsigned int uniphier_ld20_debug_uart_init(void)
{
u32 tmp;
sg_set_iectrl(54); /* TXD0 */
sg_set_iectrl(58); /* TXD1 */
sg_set_iectrl(90); /* TXD2 */
sg_set_iectrl(94); /* TXD3 */
sg_set_pinsel(54, 0, 8, 4); /* TXD0 -> TXD0 */
sg_set_pinsel(58, 1, 8, 4); /* SPITXD1 -> TXD1 */
sg_set_pinsel(90, 1, 8, 4); /* PC0WE -> TXD2 */
sg_set_pinsel(94, 1, 8, 4); /* PCD00 -> TXD3 */
tmp = readl(SC_CLKCTRL4);
tmp |= SC_CLKCTRL4_PERI;
writel(tmp, SC_CLKCTRL4);
return DIV_ROUND_CLOSEST(UNIPHIER_LD20_UART_CLK, 16 * CONFIG_BAUDRATE);
}

8
arch/arm/mach-uniphier/debug-uart/debug-uart.c
View file

@ -28,6 +28,7 @@ static void _debug_uart_putc(int c)
void _debug_uart_init(void) void _debug_uart_init(void)
{ {
#ifdef CONFIG_SPL_BUILD
void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE; void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE;
unsigned int divisor; unsigned int divisor;
@ -61,12 +62,6 @@ void _debug_uart_init(void)
case UNIPHIER_LD6B_ID: case UNIPHIER_LD6B_ID:
divisor = uniphier_ld6b_debug_uart_init(); divisor = uniphier_ld6b_debug_uart_init();
break; break;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_LD11) || defined(CONFIG_ARCH_UNIPHIER_LD20)
case UNIPHIER_LD11_ID:
case UNIPHIER_LD20_ID:
divisor = uniphier_ld20_debug_uart_init();
break;
#endif #endif
default: default:
return; return;
@ -75,5 +70,6 @@ void _debug_uart_init(void)
writel(UART_LCR_WLEN8 << 8, base + UNIPHIER_UART_LCR_MCR); writel(UART_LCR_WLEN8 << 8, base + UNIPHIER_UART_LCR_MCR);
writel(divisor, base + UNIPHIER_UART_LDR); writel(divisor, base + UNIPHIER_UART_LDR);
#endif
} }
DEBUG_UART_FUNCS DEBUG_UART_FUNCS

2
arch/arm/mach-uniphier/debug-uart/debug-uart.h
View file

@ -12,7 +12,5 @@ unsigned int uniphier_sld8_debug_uart_init(void);
unsigned int uniphier_pro5_debug_uart_init(void); unsigned int uniphier_pro5_debug_uart_init(void);
unsigned int uniphier_pxs2_debug_uart_init(void); unsigned int uniphier_pxs2_debug_uart_init(void);
unsigned int uniphier_ld6b_debug_uart_init(void); unsigned int uniphier_ld6b_debug_uart_init(void);
unsigned int uniphier_ld11_debug_uart_init(void);
unsigned int uniphier_ld20_debug_uart_init(void);
#endif /* _MACH_DEBUG_UART_H */ #endif /* _MACH_DEBUG_UART_H */