diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-20 08:32:19 (GMT) |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-22 23:37:56 (GMT) |
| commit | 6fc849148a677370c197e152b267dac2d3dbbdfc (patch) | |
| tree | ae8f8cee539cad8cd4fbd43c2df29e8ab2f5b127 /arch/arm/mach-uniphier | |
| parent | 87c3308cbf969f2370a647c6beea26898f0767f8 (diff) | |
| download | u-boot-6fc849148a677370c197e152b267dac2d3dbbdfc.tar.xz | |
ARM: uniphier: print Support Card info very late
Since commit 26b09c022ab6 ("ARM: uniphier: move SBC and Support Card
init code to U-Boot proper"), the System Bus is initialized by
board_init(). The show_board_info() is called from board_init_f()
by default, so the revision register of the Micro Support Card may
not be accessed at this point. Show its revision after the System
Bus is initialized.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier')
| -rw-r--r-- | arch/arm/mach-uniphier/micro-support-card.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 2b231ac..8a30341 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -43,18 +43,13 @@ static int support_card_show_revision(void) revision &= 0xff; /* revision 3.6.x card changed the revision format */ - printf("(CPLD version %s%d.%d)\n", revision >> 4 == 6 ? "3." : "", + printf("SC: Micro Support Card (CPLD version %s%d.%d)\n", + revision >> 4 == 6 ? "3." : "", revision >> 4, revision & 0xf); return 0; } -int checkboard(void) -{ - printf("SC: Micro Support Card "); - return support_card_show_revision(); -} - void support_card_init(void) { support_card_reset(); @@ -64,6 +59,8 @@ void support_card_init(void) */ udelay(200); support_card_reset_deassert(); + + support_card_show_revision(); } #if defined(CONFIG_SMC911X) |