ARM: uniphier: refactor Support Card init code

Splitting reset assertion (support_card_reset) and deassertion
(support_card_init) is not adding much value any more.  Handle
all the initialization of Support Card in support_card_init(),
then remove support_card_reset().

Also, detect_num_flash_banks() can have a static qualifier.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

10 files changed, 8 insertions, 28 deletions

diff --git a/arch/arm/mach-uniphier/init/init-ld11.c b/arch/arm/mach-uniphier/init/init-ld11.c
index 64fe000eba..e19dc5b1a7 100644
--- a/arch/arm/mach-uniphier/init/init-ld11.c
+++ b/arch/arm/mach-uniphier/init/init-ld11.c
@@ -15,8 +15,6 @@ int uniphier_ld11_init(const struct uniphier_board_data *bd)
 {
 	uniphier_ld11_sbc_init();
 
-	support_card_reset();
-
 	support_card_init();
 
 	led_puts("L0");
diff --git a/arch/arm/mach-uniphier/init/init-ld20.c b/arch/arm/mach-uniphier/init/init-ld20.c
index ec4563b3a1..e056d5d0b9 100644
--- a/arch/arm/mach-uniphier/init/init-ld20.c
+++ b/arch/arm/mach-uniphier/init/init-ld20.c
@@ -15,8 +15,6 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd)
 {
 	uniphier_ld11_sbc_init();
 
-	support_card_reset();
-
 	support_card_init();
 
 	led_puts("L0");
diff --git a/arch/arm/mach-uniphier/init/init-ld4.c b/arch/arm/mach-uniphier/init/init-ld4.c
index a56fb7fc19..a5b9493546 100644
--- a/arch/arm/mach-uniphier/init/init-ld4.c
+++ b/arch/arm/mach-uniphier/init/init-ld4.c
@@ -18,12 +18,10 @@ int uniphier_ld4_init(const struct uniphier_board_data *bd)
 
 	uniphier_ld4_sbc_init();
 
-	support_card_reset();
+	support_card_init();
 
 	uniphier_ld4_dpll_init(bd);
 
-	support_card_init();
-
 	led_puts("L0");
 
 	uniphier_memconf_2ch_init(bd);
diff --git a/arch/arm/mach-uniphier/init/init-pro4.c b/arch/arm/mach-uniphier/init/init-pro4.c
index 8e2ebc7386..c277071450 100644
--- a/arch/arm/mach-uniphier/init/init-pro4.c
+++ b/arch/arm/mach-uniphier/init/init-pro4.c
@@ -16,12 +16,10 @@ int uniphier_pro4_init(const struct uniphier_board_data *bd)
 {
 	uniphier_sbc_init_savepin();
 
-	support_card_reset();
+	support_card_init();
 
 	uniphier_pro4_dpll_init(bd);
 
-	support_card_init();
-
 	led_puts("L0");
 
 	uniphier_memconf_2ch_init(bd);
diff --git a/arch/arm/mach-uniphier/init/init-pro5.c b/arch/arm/mach-uniphier/init/init-pro5.c
index 37c62ef1b3..4e7041b19b 100644
--- a/arch/arm/mach-uniphier/init/init-pro5.c
+++ b/arch/arm/mach-uniphier/init/init-pro5.c
@@ -14,8 +14,6 @@ int uniphier_pro5_init(const struct uniphier_board_data *bd)
 {
 	uniphier_sbc_init_savepin();
 
-	support_card_reset();
-
 	support_card_init();
 
 	led_puts("L0");
diff --git a/arch/arm/mach-uniphier/init/init-pxs2.c b/arch/arm/mach-uniphier/init/init-pxs2.c
index d080b9bfbb..f7d5b4870c 100644
--- a/arch/arm/mach-uniphier/init/init-pxs2.c
+++ b/arch/arm/mach-uniphier/init/init-pxs2.c
@@ -16,8 +16,6 @@ int uniphier_pxs2_init(const struct uniphier_board_data *bd)
 
 	uniphier_pxs2_sbc_init();
 
-	support_card_reset();
-
 	support_card_init();
 
 	led_puts("L0");
diff --git a/arch/arm/mach-uniphier/init/init-sld3.c b/arch/arm/mach-uniphier/init/init-sld3.c
index 0b8d6c510a..50d9eafd11 100644
--- a/arch/arm/mach-uniphier/init/init-sld3.c
+++ b/arch/arm/mach-uniphier/init/init-sld3.c
@@ -18,12 +18,10 @@ int uniphier_sld3_init(const struct uniphier_board_data *bd)
 
 	uniphier_sbc_init_admulti();
 
-	support_card_reset();
+	support_card_init();
 
 	uniphier_sld3_dpll_init(bd);
 
-	support_card_init();
-
 	led_puts("L0");
 
 	uniphier_memconf_3ch_no_disbit_init(bd);
diff --git a/arch/arm/mach-uniphier/init/init-sld8.c b/arch/arm/mach-uniphier/init/init-sld8.c
index 075ac2739f..8da2843578 100644
--- a/arch/arm/mach-uniphier/init/init-sld8.c
+++ b/arch/arm/mach-uniphier/init/init-sld8.c
@@ -18,12 +18,10 @@ int uniphier_sld8_init(const struct uniphier_board_data *bd)
 
 	uniphier_ld4_sbc_init();
 
-	support_card_reset();
+	support_card_init();
 
 	uniphier_sld8_dpll_init(bd);
 
-	support_card_init();
-
 	led_puts("L0");
 
 	uniphier_memconf_2ch_init(bd);
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index e53bcdf8e3..80c5d97082 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -25,12 +25,12 @@
  * bit[0]: LAN, I2C, LED
  * bit[1]: UART
  */
-void support_card_reset_deassert(void)
+static void support_card_reset_deassert(void)
 {
 	writel(0x00010000, MICRO_SUPPORT_CARD_RESET);
 }
 
-void support_card_reset(void)
+static void support_card_reset(void)
 {
 	writel(0x00020003, MICRO_SUPPORT_CARD_RESET);
 }
@@ -57,6 +57,7 @@ int checkboard(void)
 
 void support_card_init(void)
 {
+	support_card_reset();
 	/*
 	 * After power on, we need to keep the LAN controller in reset state
 	 * for a while. (200 usec)
@@ -157,7 +158,7 @@ static void detect_num_flash_banks(void)
 	debug("number of flash banks: %d\n", cfi_flash_num_flash_banks);
 }
 #else /* CONFIG_SYS_NO_FLASH */
-void detect_num_flash_banks(void)
+static void detect_num_flash_banks(void)
 {
 };
 #endif /* CONFIG_SYS_NO_FLASH */
diff --git a/arch/arm/mach-uniphier/micro-support-card.h b/arch/arm/mach-uniphier/micro-support-card.h
index 4dae60312f..90990ba404 100644
--- a/arch/arm/mach-uniphier/micro-support-card.h
+++ b/arch/arm/mach-uniphier/micro-support-card.h
@@ -10,15 +10,10 @@
 #define MICRO_SUPPORT_CARD_H
 
 #if defined(CONFIG_MICRO_SUPPORT_CARD)
-void support_card_reset(void);
 void support_card_init(void);
 void support_card_late_init(void);
 void led_puts(const char *s);
 #else
-static inline void support_card_reset(void)
-{
-}
-
 static inline void support_card_init(void)
 {
 }