From a051a99f0d76d767d57b8d7f12f64acd28bd1ce7 Mon Sep 17 00:00:00 2001 From: Tero Kristo Date: Thu, 16 Mar 2017 09:48:54 +0200 Subject: [PATCH] ARM: am43xx: fix SOC revision print outs Currently, AM43xx just re-uses the version strings from AM33xx which is wrong; the actual values for AM43xx are different. Fix this by adding a separate version string array for AM43xx and use this instead. Signed-off-by: Tero Kristo Reported-by: Sekhar Nori Reviewed-by: Lukasz Majewski Reviewed-by: Tom Rini --- arch/arm/mach-omap2/am33xx/sys_info.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c index f0f72fa6d4..e4fc461bd8 100644 --- a/arch/arm/mach-omap2/am33xx/sys_info.c +++ b/arch/arm/mach-omap2/am33xx/sys_info.c @@ -74,6 +74,10 @@ static char *cpu_revs[] = { "2.0", "2.1"}; +static char *cpu_revs_am43xx[] = { + "1.0", + "1.1", + "1.2"}; static char *dev_types[] = { "TST", @@ -87,6 +91,7 @@ static char *dev_types[] = { int print_cpuinfo(void) { char *cpu_s, *sec_s, *rev_s; + char **cpu_rev_arr = cpu_revs; switch (get_cpu_type()) { case AM335X: @@ -97,6 +102,7 @@ int print_cpuinfo(void) break; case AM437X: cpu_s = "AM437X"; + cpu_rev_arr = cpu_revs_am43xx; break; default: cpu_s = "Unknown CPU type"; @@ -104,7 +110,7 @@ int print_cpuinfo(void) } if (get_cpu_rev() < ARRAY_SIZE(cpu_revs)) - rev_s = cpu_revs[get_cpu_rev()]; + rev_s = cpu_rev_arr[get_cpu_rev()]; else rev_s = "?";