summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-11 20:17:48 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-25 00:27:53 +0900
commit9628afa7f5cd6d752adc7bb77ea14fd639a66d03 (patch)
treec11963a6f3ff278887b38b109a500cf2b4a6912d /arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
parentd5ed8c5727f6985505ceb6e8640528e7e08e9670 (diff)
downloadtalos-obmc-uboot-9628afa7f5cd6d752adc7bb77ea14fd639a66d03.tar.gz
talos-obmc-uboot-9628afa7f5cd6d752adc7bb77ea14fd639a66d03.zip
ARM: uniphier: remove ifdef CONFIG_{SOC} conditionals from sg-regs.h
To achieve the complete run-time configuration by device trees, ifdef conditionals in header files are not preferable. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S')
-rw-r--r--arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S b/arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
index 73f0f63eba..3ada4c9948 100644
--- a/arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
+++ b/arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
@@ -17,8 +17,8 @@ ENTRY(setup_lowlevel_debug)
init_debug_uart r0, r1, r2
/* UART Port 0 */
- set_pinsel 70, 3, r0, r1
- set_pinsel 71, 3, r0, r1
+ sg_set_pinsel 70, 3, 8, 4, r0, r1
+ sg_set_pinsel 71, 3, 8, 4, r0, r1
ldr r0, =SG_IECTRL
ldr r1, [r0]
OpenPOWER on IntegriCloud