diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-15 05:59:05 (GMT) |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-17 00:00:40 (GMT) |
| commit | 9e3bb84bd880d8be82351d689415d6e142dfab32 (patch) | |
| tree | db85b644564bc6e04d5699b405cd1bb1d4c92e0e /arch/arm/mach-uniphier/sbc/sbc-ld4.c | |
| parent | 8d6c99c66f94c78e65fdacca2fb2857101f8a5e7 (diff) | |
| download | u-boot-9e3bb84bd880d8be82351d689415d6e142dfab32.tar.xz | |
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-ld4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/sbc/sbc-ld4.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/sbc/sbc-ld4.c b/arch/arm/mach-uniphier/sbc/sbc-ld4.c index 12bee79..24a55ea 100644 --- a/arch/arm/mach-uniphier/sbc/sbc-ld4.c +++ b/arch/arm/mach-uniphier/sbc/sbc-ld4.c @@ -1,5 +1,6 @@ /* - * Copyright (C) 2011-2016 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2011-2015 Panasonic Corporation + * Copyright (C) 2015-2017 Socionext Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,14 +10,14 @@ #include "../init.h" #include "sbc-regs.h" -int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd) +void uniphier_ld4_sbc_init(void) { u32 tmp; + uniphier_sbc_init_savepin(); + /* system bus output enable */ tmp = readl(PC0CTRL); tmp &= 0xfffffcff; writel(tmp, PC0CTRL); - - return 0; } |