ARM: uniphier: remove unused init code for CONFIG_DEBUG_UART

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>

diff --git a/arch/arm/mach-uniphier/debug-uart/Makefile b/arch/arm/mach-uniphier/debug-uart/Makefile
index 5d78db5..81e9314 100644 (file)
--- a/arch/arm/mach-uniphier/debug-uart/Makefile
+++ b/arch/arm/mach-uniphier/debug-uart/Makefile
@@ -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_PXS2)       += debug-uart-pxs2.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
 
 obj-y                                  += debug-uart.o

diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld20.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld20.c
deleted file mode 100644 (file)
index b742feb..0000000
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld20.c
+++ /dev/null
@@ -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);
-}

diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
index 992b4a9..db2904b 100644 (file)
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
@@ -28,6 +28,7 @@ static void _debug_uart_putc(int c)
 
 void _debug_uart_init(void)
 {
+#ifdef CONFIG_SPL_BUILD
        void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE;
        unsigned int divisor;
 
@@ -62,12 +63,6 @@ void _debug_uart_init(void)
                divisor = uniphier_ld6b_debug_uart_init();
                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
        default:
                return;
        }
@@ -75,5 +70,6 @@ void _debug_uart_init(void)
        writel(UART_LCR_WLEN8 << 8, base + UNIPHIER_UART_LCR_MCR);
 
        writel(divisor, base + UNIPHIER_UART_LDR);
+#endif
 }
 DEBUG_UART_FUNCS

diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.h b/arch/arm/mach-uniphier/debug-uart/debug-uart.h
index 4cbd2f0..689da7c 100644 (file)
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.h
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.h
@@ -12,7 +12,5 @@ unsigned int uniphier_sld8_debug_uart_init(void);
 unsigned int uniphier_pro5_debug_uart_init(void);
 unsigned int uniphier_pxs2_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 */