summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/ph1-ld4
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-22 00:27:37 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-25 00:27:53 +0900
commite6eecca54ffb99ee6877c0e29b0b389a481fcd85 (patch)
tree5ef8a962055e8c99f2162331259c01591ea237e7 /arch/arm/mach-uniphier/ph1-ld4
parentfcbcd59730255018dbe78af9294598273a85a0de (diff)
downloadtalos-obmc-uboot-e6eecca54ffb99ee6877c0e29b0b389a481fcd85.tar.gz
talos-obmc-uboot-e6eecca54ffb99ee6877c0e29b0b389a481fcd85.zip
ARM: uniphier: unify low-level debug init code
Move init code of low-level debug into a single file. This is helpful to create an image that runs on multiple SoCs. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/ph1-ld4')
-rw-r--r--arch/arm/mach-uniphier/ph1-ld4/Makefile1
-rw-r--r--arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S29
2 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/mach-uniphier/ph1-ld4/Makefile b/arch/arm/mach-uniphier/ph1-ld4/Makefile
index 4a2c944aee..4b9fe91fb0 100644
--- a/arch/arm/mach-uniphier/ph1-ld4/Makefile
+++ b/arch/arm/mach-uniphier/ph1-ld4/Makefile
@@ -3,7 +3,6 @@
#
ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
obj-y += bcu_init.o pll_init.o early_clkrst_init.o \
pll_spectrum.o umc_init.o ddrphy_init.o
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc_init.o
diff --git a/arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S b/arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S
deleted file mode 100644
index c0f14e08b1..0000000000
--- a/arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * On-chip UART initializaion for low-level debugging
- *
- * Copyright (C) 2014 Panasonic Corporation
- * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <linux/linkage.h>
-#include <mach/sg-regs.h>
-
-#define UART_CLK 36864000
-#include <mach/debug-uart.S>
-
-ENTRY(setup_lowlevel_debug)
- ldr r0, =SG_IECTRL
- ldr r1, [r0]
- orr r1, r1, #1
- str r1, [r0]
-
- /* UART Port 0 */
- sg_set_pinsel 85, 1, 8, 4, r0, r1
- sg_set_pinsel 88, 1, 8, 4, r0, r1
-
- init_debug_uart r0, r1, r2
-
- mov pc, lr
-ENDPROC(setup_lowlevel_debug)
OpenPOWER on IntegriCloud