Merge git://git.denx.de/u-boot-sunxi

[people/ms/u-boot.git] / arch / arm / mach-uniphier / sbc / sbc-pxs2.c

diff --git a/arch/arm/mach-uniphier/sbc/sbc-pxs2.c b/arch/arm/mach-uniphier/sbc/sbc-pxs2.c
index acbf4c53fb5a5091b4dd1c0fe71b1b99ab2b6fc4..9ee264628bf3d0ffec33000b3082c10ff27dec30 100644 (file)
--- 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,13 @@
 #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;
+       uniphier_pin_init("system-bus");        /* PXs3 */
 }