dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: uniphier: remove unneeded argument of uniphier_ld20_pll_init()

Browse Source 
At first, we thought the LD20 PLL setting would be board dependent,
but this argument turned out unneeded after all.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada
2017-01-15 14:59:02 +09:00
parent 7a6139c97b
commit a314a245d1
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-uniphier/board_init.c
View File

@@ -58,14 +58,8 @@ static void uniphier_nand_pin_init(bool cs2)
int board_init(void) int board_init(void)
{ {
const struct uniphier_board_data *bd;
led_puts("U0"); led_puts("U0");
bd = uniphier_get_board_param();
if (!bd)
return -ENODEV;
switch (uniphier_get_soc_type()) { switch (uniphier_get_soc_type()) {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
case SOC_UNIPHIER_SLD3: case SOC_UNIPHIER_SLD3:
@@ -147,7 +141,7 @@ int board_init(void)
sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */ sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */
sg_set_iectrl(153); sg_set_iectrl(153);
led_puts("U1"); led_puts("U1");
uniphier_ld20_pll_init(bd); uniphier_ld20_pll_init();
uniphier_ld20_clk_init(); uniphier_ld20_clk_init();
cci500_init(2); cci500_init(2);
break; break;

4
arch/arm/mach-uniphier/clk/pll-ld20.c
View File

@@ -11,7 +11,7 @@
#include "../sc64-regs.h" #include "../sc64-regs.h"
#include "pll.h" #include "pll.h"
int uniphier_ld20_pll_init(const struct uniphier_board_data *bd) void uniphier_ld20_pll_init(void)
{ {
uniphier_ld20_sscpll_init(SC_CPLLCTRL, UNIPHIER_PLL_FREQ_DEFAULT, 0, 4); uniphier_ld20_sscpll_init(SC_CPLLCTRL, UNIPHIER_PLL_FREQ_DEFAULT, 0, 4);
/* do nothing for SPLL */ /* do nothing for SPLL */
@@ -36,6 +36,4 @@ int uniphier_ld20_pll_init(const struct uniphier_board_data *bd)
uniphier_ld20_dspll_init(SC_VPLL8KCTRL); uniphier_ld20_dspll_init(SC_VPLL8KCTRL);
uniphier_ld20_dspll_init(SC_A2PLLCTRL); uniphier_ld20_dspll_init(SC_A2PLLCTRL);
return 0;
} }

2
arch/arm/mach-uniphier/init.h
View File

@@ -105,7 +105,7 @@ void uniphier_sld3_pll_init(void);
void uniphier_ld4_pll_init(void); void uniphier_ld4_pll_init(void);
void uniphier_pro4_pll_init(void); void uniphier_pro4_pll_init(void);
void uniphier_ld11_pll_init(void); void uniphier_ld11_pll_init(void);
int uniphier_ld20_pll_init(const struct uniphier_board_data *bd); void uniphier_ld20_pll_init(void);
void uniphier_ld4_clk_init(void); void uniphier_ld4_clk_init(void);
void uniphier_pro4_clk_init(void); void uniphier_pro4_clk_init(void);