diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-18 12:12:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-18 14:05:30 -0400 |
| commit | 9a6535e05f17acf03e891266a650cb6029124743 (patch) | |
| tree | fec0cd46e0f050812deecf89b8bb349c8fdffd0e /arch/arm/mach-uniphier/init/init-pro4.c | |
| parent | b58d3512442357cb023bce69f55c08b9fd21beaa (diff) | |
| parent | f9d7e17e844f9e94c39a8c95f73a4454097a6948 (diff) | |
| download | u-boot-imx-9a6535e05f17acf03e891266a650cb6029124743.zip u-boot-imx-9a6535e05f17acf03e891266a650cb6029124743.tar.gz u-boot-imx-9a6535e05f17acf03e891266a650cb6029124743.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/init/init-pro4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/init/init-pro4.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/init/init-pro4.c b/arch/arm/mach-uniphier/init/init-pro4.c index 3528d84..2825150 100644 --- a/arch/arm/mach-uniphier/init/init-pro4.c +++ b/arch/arm/mach-uniphier/init/init-pro4.c @@ -1,5 +1,7 @@ /* - * Copyright (C) 2013-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2013-2015 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -16,7 +18,7 @@ int uniphier_pro4_init(const struct uniphier_board_data *bd) support_card_reset(); - uniphier_pro4_pll_init(bd); + uniphier_pro4_dpll_init(bd); support_card_init(); @@ -50,9 +52,5 @@ int uniphier_pro4_init(const struct uniphier_board_data *bd) led_puts("L5"); - uniphier_ld4_enable_dpll_ssc(bd); - - led_puts("L6"); - return 0; } |