[PATCH] ARM: RX51: Set system_rev from ATAGS
From: tony@atomide.com (Tony Lindgren)
Date: 2016-02-08 20:48:12
Also in:
linux-omap, lkml
* Ivaylo Dimitrov [off-list ref] [160205 10:17]: Can you please add the "why?" part here? Other than that looks OK to me. And unless people have objections, I'd like to get this merged in as it fixes yet another legacy boot vs DT boot regression. Regards, Tony
quoted hunk ↗ jump to hunk
Signed-off-by: Ivaylo Dimitrov <redacted> --- arch/arm/mach-omap2/board-generic.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 8098272..b91fabe 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c@@ -18,6 +18,7 @@ #include <asm/setup.h> #include <asm/mach/arch.h> +#include <asm/system_info.h> #include "common.h"@@ -77,12 +78,31 @@ static const char *const n900_boards_compat[] __initconst = { NULL, }; +/* Set system_rev from atags */ +static void __init rx51_system_rev(const struct tag *tags) +{ + const struct tag *tag; + + if (tags->hdr.tag != ATAG_CORE) + return; + + for_each_tag(tag, tags) { + if (tag->hdr.tag == ATAG_REVISION) { + system_rev = tag->u.revision.rev; + break; + } + } +} + /* Legacy userspace on Nokia N900 needs ATAGS exported in /proc/atags, * save them while the data is still not overwritten */ static void __init rx51_reserve(void) { - save_atags((const struct tag *)(PAGE_OFFSET + 0x100)); + const struct tag *tags = (const struct tag *)(PAGE_OFFSET + 0x100); + + save_atags(tags); + rx51_system_rev(tags); omap_reserve(); }-- 1.9.1