summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-23 00:07:23 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-24 00:15:28 +0900
commit7d1a3a67bcabb19ac69dafc7b5f4ad4e397442b8 (patch)
tree445fe50c90836d7141496c91e998bd8d7d11bdbd /arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
parent94ab98bb1c963bb9694955a9512044ef2630a4fe (diff)
downloadu-boot-imx-7d1a3a67bcabb19ac69dafc7b5f4ad4e397442b8.zip
u-boot-imx-7d1a3a67bcabb19ac69dafc7b5f4ad4e397442b8.tar.gz
u-boot-imx-7d1a3a67bcabb19ac69dafc7b5f4ad4e397442b8.tar.bz2
ARM: UniPhier: move UART pin settings to SPL
The UniPhier platform is going to enable Driver Model and UART support on SPL. Move UART pin settings to early_pin_init(), which is called from SPL. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/ph1-pro4/pinctrl.c')
-rw-r--r--arch/arm/mach-uniphier/ph1-pro4/pinctrl.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c b/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
index f382ef4..4df9098 100644
--- a/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
+++ b/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
@@ -1,10 +1,10 @@
/*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Panasonic Corporation
+ * Copyright (C) 2015 Socionext Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <asm/io.h>
#include <mach/sg-regs.h>
@@ -12,17 +12,6 @@ void pin_init(void)
{
/* Comment format: PAD Name -> Function Name */
-#ifdef CONFIG_UNIPHIER_SERIAL
- sg_set_pinsel(127, 0); /* RXD0 -> RXD0 */
- sg_set_pinsel(128, 0); /* TXD0 -> TXD0 */
- sg_set_pinsel(129, 0); /* RXD1 -> RXD1 */
- sg_set_pinsel(130, 0); /* TXD1 -> TXD1 */
- sg_set_pinsel(131, 0); /* RXD2 -> RXD2 */
- sg_set_pinsel(132, 0); /* TXD2 -> TXD2 */
- sg_set_pinsel(88, 2); /* CH6CLK -> RXD3 */
- sg_set_pinsel(89, 2); /* CH6VAL -> TXD3 */
-#endif
-
#ifdef CONFIG_NAND_DENALI
sg_set_pinsel(40, 0); /* NFD0 -> NFD0 */
sg_set_pinsel(41, 0); /* NFD1 -> NFD1 */