diff mbox

[U-Boot,1/9] ARM: uniphier: remove unneeded argument of uniphier_ld20_pll_init()

Message ID 1484459950-8644-2-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit a314a245d14547df0a88e1ea568116fd7947daf4
Delegated to: Masahiro Yamada
Headers show

Commit Message

Masahiro Yamada Jan. 15, 2017, 5:59 a.m. UTC 
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>
---

 arch/arm/mach-uniphier/board_init.c   | 8 +-------
 arch/arm/mach-uniphier/clk/pll-ld20.c | 4 +---
 arch/arm/mach-uniphier/init.h         | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 8c7864c..4cab7fe 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -58,14 +58,8 @@  static void uniphier_nand_pin_init(bool cs2)
 
 int board_init(void)
 {
-	const struct uniphier_board_data *bd;
-
 	led_puts("U0");
 
-	bd = uniphier_get_board_param();
-	if (!bd)
-		return -ENODEV;
-
 	switch (uniphier_get_soc_type()) {
 #if defined(CONFIG_ARCH_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_iectrl(153);
 		led_puts("U1");
-		uniphier_ld20_pll_init(bd);
+		uniphier_ld20_pll_init();
 		uniphier_ld20_clk_init();
 		cci500_init(2);
 		break;
diff --git a/arch/arm/mach-uniphier/clk/pll-ld20.c b/arch/arm/mach-uniphier/clk/pll-ld20.c
index 8ad6883..121a369 100644
--- a/arch/arm/mach-uniphier/clk/pll-ld20.c
+++ b/arch/arm/mach-uniphier/clk/pll-ld20.c
@@ -11,7 +11,7 @@ 
 #include "../sc64-regs.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);
 	/* 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_A2PLLCTRL);
-
-	return 0;
 }
diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index f3f9e54..af74dd8 100644
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -105,7 +105,7 @@  void uniphier_sld3_pll_init(void);
 void uniphier_ld4_pll_init(void);
 void uniphier_pro4_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_pro4_clk_init(void);