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 <stefan@agner.ch>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index e61d1adb10ff82e6c3b82f0480c9e2e8c33ced43..a0bcf38f29f304a3a437c2280397fe9aafd366ba 100644 (file)
--- 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),