summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/sbc/sbc-pxs2.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-01-15 14:59:05 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-01-17 09:00:40 +0900
commit9e3bb84bd880d8be82351d689415d6e142dfab32 (patch)
treedb85b644564bc6e04d5699b405cd1bb1d4c92e0e /arch/arm/mach-uniphier/sbc/sbc-pxs2.c
parent8d6c99c66f94c78e65fdacca2fb2857101f8a5e7 (diff)
downloadu-boot-imx-9e3bb84bd880d8be82351d689415d6e142dfab32.zip
u-boot-imx-9e3bb84bd880d8be82351d689415d6e142dfab32.tar.gz
u-boot-imx-9e3bb84bd880d8be82351d689415d6e142dfab32.tar.bz2
ARM: uniphier: refactor SBC init code
Merge sbc-admulti.c and sbc-savepin.c into a single file to avoid code duplication. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/sbc/sbc-pxs2.c')
-rw-r--r--arch/arm/mach-uniphier/sbc/sbc-pxs2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/sbc/sbc-pxs2.c b/arch/arm/mach-uniphier/sbc/sbc-pxs2.c
index acbf4c5..342a086 100644
--- a/arch/arm/mach-uniphier/sbc/sbc-pxs2.c
+++ b/arch/arm/mach-uniphier/sbc/sbc-pxs2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2016-2017 Socionext Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -9,11 +9,11 @@
#include "../init.h"
#include "sbc-regs.h"
-int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd)
+void uniphier_pxs2_sbc_init(void)
{
+ uniphier_sbc_init_savepin();
+
/* necessary for ROM boot ?? */
/* system bus output enable */
writel(0x17, PC0CTRL);
-
- return 0;
}