diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
| commit | d38de7cb03adf88e18c05d840c2528b7a5af2f9b (patch) | |
| tree | 35be69932e53e4c58260af58ae841a3d1a2523b6 /arch/arm/mach-uniphier/board_init.c | |
| parent | b24cf8540a85a9bf97975aadd6a7542f166c78a3 (diff) | |
| parent | bc647958047cd03193e19cd8c08a6771fea828b7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Fix regressions caused by the previous reworks
- Add pin configuration support
- Re-work SPL code
- Update DRAM and PLL setup code
- Enable needed configs, disable unneeded configs
Diffstat (limited to 'arch/arm/mach-uniphier/board_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index e89a4c59e2a..2564a02a623 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -165,6 +165,7 @@ static const struct uniphier_initdata uniphier_initdata[] = { .nand_2cs = false, .sbc_init = uniphier_ld11_sbc_init, .pll_init = uniphier_ld20_pll_init, + .clk_init = uniphier_ld20_clk_init, .misc_init = uniphier_ld20_misc_init, }, #endif |