diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-17 16:39:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-17 16:39:43 (GMT) |
| commit | bfd07670a48d9fbf22646c93e07dcd8cbc8d0864 (patch) | |
| tree | 3ce5c9c53c29c93bd72adfecfc0085b8a9346ad6 /arch/arm/mach-uniphier/sbc/sbc-pxs2.c | |
| parent | 373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (diff) | |
| parent | 2cfa35c47b9c9b80c8ff084f55391a03fd575956 (diff) | |
| download | u-boot-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Enable eMMC driver for LD11/LD20 SoCs
- Refactoring of SoC init code
- Bug fix of pinctrl driver
Diffstat (limited to 'arch/arm/mach-uniphier/sbc/sbc-pxs2.c')
| -rw-r--r-- | arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 8 |
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; } |