diff options
author | Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> | 2016-01-01 06:49:36 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-04 06:26:00 -0500 |
commit | 8c51b034938fb37b7ffc2e7c49a39b284f5c08c0 (patch) | |
tree | 9a3ed1552f7da64fd15bfb08bd956f76b5a19bcb /arch/arm/mach-omap2 | |
parent | 6e0306a97d18bb9bec71b1f3db0dbc6b14c5f51b (diff) |
ARM: 8496/1: OMAP: RX51: save ATAGS data in the early boot stage
This fixes a regression with device tree based booting compared to legacy booting for n900 to make the n900 legacy user space to also work with device tree based booting
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 04a56cc04dfa..809827265fb3 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
17 | #include <linux/irqdomain.h> | 17 | #include <linux/irqdomain.h> |
18 | 18 | ||
19 | #include <asm/setup.h> | ||
19 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
20 | 21 | ||
21 | #include "common.h" | 22 | #include "common.h" |
@@ -76,8 +77,17 @@ static const char *const n900_boards_compat[] __initconst = { | |||
76 | NULL, | 77 | NULL, |
77 | }; | 78 | }; |
78 | 79 | ||
80 | /* Legacy userspace on Nokia N900 needs ATAGS exported in /proc/atags, | ||
81 | * save them while the data is still not overwritten | ||
82 | */ | ||
83 | static void __init rx51_reserve(void) | ||
84 | { | ||
85 | save_atags((const struct tag *)(PAGE_OFFSET + 0x100)); | ||
86 | omap_reserve(); | ||
87 | } | ||
88 | |||
79 | DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") | 89 | DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") |
80 | .reserve = omap_reserve, | 90 | .reserve = rx51_reserve, |
81 | .map_io = omap3_map_io, | 91 | .map_io = omap3_map_io, |
82 | .init_early = omap3430_init_early, | 92 | .init_early = omap3430_init_early, |
83 | .init_machine = omap_generic_init, | 93 | .init_machine = omap_generic_init, |