From cf47c0e23a25f10ea87fdb3ac4b1e4ea14823e16 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 27 Nov 2020 17:28:20 +0100 Subject: [PATCH] ARM: meson: isolate loading of socinfo Move loading of socinfo into a separate function so the value can be reused later. Signed-off-by: Stefan Agner Reviewed-by: Neil Armstrong Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/board-info.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index e61d1adb10..a0bcf38f29 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -131,7 +131,7 @@ static void print_board_model(void) printf("Model: %s\n", model ? model : "Unknown"); } -int show_board_info(void) +static unsigned int get_socinfo(void) { struct regmap *regmap; int nodeoffset, ret; @@ -163,8 +163,20 @@ int show_board_info(void) return 0; } + return socinfo; +} + +int show_board_info(void) +{ + unsigned int socinfo; + /* print board information */ print_board_model(); + + socinfo = get_socinfo(); + if (!socinfo) + return 0; + printf("SoC: Amlogic Meson %s (%s) Revision %x:%x (%x:%x)\n", socinfo_to_soc_id(socinfo), socinfo_to_package_id(socinfo), -- 2.39.5