diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-17 11:39:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-17 11:39:43 -0500 |
| commit | bfd07670a48d9fbf22646c93e07dcd8cbc8d0864 (patch) | |
| tree | 3ce5c9c53c29c93bd72adfecfc0085b8a9346ad6 /arch/arm/mach-uniphier/bcu/bcu-ld4.c | |
| parent | 373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (diff) | |
| parent | 2cfa35c47b9c9b80c8ff084f55391a03fd575956 (diff) | |
| download | u-boot-imx-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.zip u-boot-imx-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.gz u-boot-imx-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.bz2 | |
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/bcu/bcu-ld4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/bcu/bcu-ld4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/bcu/bcu-ld4.c b/arch/arm/mach-uniphier/bcu/bcu-ld4.c index eeab802..7557880 100644 --- a/arch/arm/mach-uniphier/bcu/bcu-ld4.c +++ b/arch/arm/mach-uniphier/bcu/bcu-ld4.c @@ -1,5 +1,7 @@ /* - * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2011-2014 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -11,7 +13,7 @@ #define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x)) -int uniphier_ld4_bcu_init(const struct uniphier_board_data *bd) +void uniphier_ld4_bcu_init(const struct uniphier_board_data *bd) { int shift; @@ -30,6 +32,4 @@ int uniphier_ld4_bcu_init(const struct uniphier_board_data *bd) shift -= 32; writel(ch(shift), BCIPPCCHR4); /* 0xc0000000-0xdfffffff */ - - return 0; } |