Skip to content
Snippets Groups Projects
Commit 6fc84914 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

ARM: uniphier: print Support Card info very late


Since commit 26b09c02 ("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 87c3308c
No related branches found
No related tags found
No related merge requests found
...@@ -43,18 +43,13 @@ static int support_card_show_revision(void) ...@@ -43,18 +43,13 @@ static int support_card_show_revision(void)
revision &= 0xff; revision &= 0xff;
/* revision 3.6.x card changed the revision format */ /* 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); revision >> 4, revision & 0xf);
return 0; return 0;
} }
int checkboard(void)
{
printf("SC: Micro Support Card ");
return support_card_show_revision();
}
void support_card_init(void) void support_card_init(void)
{ {
support_card_reset(); support_card_reset();
...@@ -64,6 +59,8 @@ void support_card_init(void) ...@@ -64,6 +59,8 @@ void support_card_init(void)
*/ */
udelay(200); udelay(200);
support_card_reset_deassert(); support_card_reset_deassert();
support_card_show_revision();
} }
#if defined(CONFIG_SMC911X) #if defined(CONFIG_SMC911X)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment