leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: uniphier: refactor Support Card init code

Browse Source 
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>
This commit is contained in:
Masahiro Yamada
2017-01-15 14:59:06 +09:00
parent 9e3bb84bd8
commit ef07a99b08
10 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-uniphier/init/init-ld11.c
View File

@@ -15,8 +15,6 @@ int uniphier_ld11_init(const struct uniphier_board_data *bd)
{ {
uniphier_ld11_sbc_init(); uniphier_ld11_sbc_init();
support_card_reset();
support_card_init(); support_card_init();
led_puts("L0"); led_puts("L0");

2
arch/arm/mach-uniphier/init/init-ld20.c
View File

@@ -15,8 +15,6 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd)
{ {
uniphier_ld11_sbc_init(); uniphier_ld11_sbc_init();
support_card_reset();
support_card_init(); support_card_init();
led_puts("L0"); led_puts("L0");

4
arch/arm/mach-uniphier/init/init-ld4.c
View File

@@ -18,12 +18,10 @@ int uniphier_ld4_init(const struct uniphier_board_data *bd)
uniphier_ld4_sbc_init(); uniphier_ld4_sbc_init();
support_card_reset(); support_card_init();
uniphier_ld4_dpll_init(bd); uniphier_ld4_dpll_init(bd);
support_card_init();
led_puts("L0"); led_puts("L0");
uniphier_memconf_2ch_init(bd); uniphier_memconf_2ch_init(bd);

4
arch/arm/mach-uniphier/init/init-pro4.c
View File

@@ -16,12 +16,10 @@ int uniphier_pro4_init(const struct uniphier_board_data *bd)
{ {
uniphier_sbc_init_savepin(); uniphier_sbc_init_savepin();
support_card_reset(); support_card_init();
uniphier_pro4_dpll_init(bd); uniphier_pro4_dpll_init(bd);
support_card_init();
led_puts("L0"); led_puts("L0");
uniphier_memconf_2ch_init(bd); uniphier_memconf_2ch_init(bd);

2
arch/arm/mach-uniphier/init/init-pro5.c
View File

@@ -14,8 +14,6 @@ int uniphier_pro5_init(const struct uniphier_board_data *bd)
{ {
uniphier_sbc_init_savepin(); uniphier_sbc_init_savepin();
support_card_reset();
support_card_init(); support_card_init();
led_puts("L0"); led_puts("L0");

2
arch/arm/mach-uniphier/init/init-pxs2.c
View File

@@ -16,8 +16,6 @@ int uniphier_pxs2_init(const struct uniphier_board_data *bd)
uniphier_pxs2_sbc_init(); uniphier_pxs2_sbc_init();
support_card_reset();
support_card_init(); support_card_init();
led_puts("L0"); led_puts("L0");

4
arch/arm/mach-uniphier/init/init-sld3.c
View File

@@ -18,12 +18,10 @@ int uniphier_sld3_init(const struct uniphier_board_data *bd)
uniphier_sbc_init_admulti(); uniphier_sbc_init_admulti();
support_card_reset(); support_card_init();
uniphier_sld3_dpll_init(bd); uniphier_sld3_dpll_init(bd);
support_card_init();
led_puts("L0"); led_puts("L0");
uniphier_memconf_3ch_no_disbit_init(bd); uniphier_memconf_3ch_no_disbit_init(bd);

4
arch/arm/mach-uniphier/init/init-sld8.c
View File

@@ -18,12 +18,10 @@ int uniphier_sld8_init(const struct uniphier_board_data *bd)
uniphier_ld4_sbc_init(); uniphier_ld4_sbc_init();
support_card_reset(); support_card_init();
uniphier_sld8_dpll_init(bd); uniphier_sld8_dpll_init(bd);
support_card_init();
led_puts("L0"); led_puts("L0");
uniphier_memconf_2ch_init(bd); uniphier_memconf_2ch_init(bd);

7
arch/arm/mach-uniphier/micro-support-card.c
View File

@@ -25,12 +25,12 @@
* bit[0]: LAN, I2C, LED * bit[0]: LAN, I2C, LED
* bit[1]: UART * bit[1]: UART
*/ */
void support_card_reset_deassert(void) static void support_card_reset_deassert(void)
{ {
writel(0x00010000, MICRO_SUPPORT_CARD_RESET); writel(0x00010000, MICRO_SUPPORT_CARD_RESET);
} }
void support_card_reset(void) static void support_card_reset(void)
{ {
writel(0x00020003, MICRO_SUPPORT_CARD_RESET); writel(0x00020003, MICRO_SUPPORT_CARD_RESET);
} }
@@ -57,6 +57,7 @@ int checkboard(void)
void support_card_init(void) void support_card_init(void)
{ {
support_card_reset();
/* /*
* After power on, we need to keep the LAN controller in reset state * After power on, we need to keep the LAN controller in reset state
* for a while. (200 usec) * 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); debug("number of flash banks: %d\n", cfi_flash_num_flash_banks);
} }
#else /* CONFIG_SYS_NO_FLASH */ #else /* CONFIG_SYS_NO_FLASH */
void detect_num_flash_banks(void) static void detect_num_flash_banks(void)
{ {
}; };
#endif /* CONFIG_SYS_NO_FLASH */ #endif /* CONFIG_SYS_NO_FLASH */

5
arch/arm/mach-uniphier/micro-support-card.h
View File

@@ -10,15 +10,10 @@
#define MICRO_SUPPORT_CARD_H #define MICRO_SUPPORT_CARD_H
#if defined(CONFIG_MICRO_SUPPORT_CARD) #if defined(CONFIG_MICRO_SUPPORT_CARD)
void support_card_reset(void);
void support_card_init(void); void support_card_init(void);
void support_card_late_init(void); void support_card_late_init(void);
void led_puts(const char *s); void led_puts(const char *s);
#else #else
static inline void support_card_reset(void)
{
}
static inline void support_card_init(void) static inline void support_card_init(void)
{ {
} }