diff options
| author | Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> | 2016-02-10 19:23:02 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-02-11 01:17:15 +0100 |
| commit | 5f35dc47c1744110d4119c4aa2a00872e8a1217b (patch) | |
| tree | 0b149c8dbacad3f3947ec3fe0840fae6c134834d | |
| parent | Linux 4.5-rc3 (diff) | |
| download | linux-5f35dc47c1744110d4119c4aa2a00872e8a1217b.tar.xz linux-5f35dc47c1744110d4119c4aa2a00872e8a1217b.zip | |
ARM: OMAP2+: Set system_rev from ATAGS for n900
This fixed a regression with DT boot compared to legacy boot.
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
[tony@atomide.com: edited patch subject to follow standard]
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 809827265fb3..bab814d2f37d 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_set_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_set_system_rev(tags); omap_reserve(); } |