summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2016-01-05 14:07:28 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2016-01-05 14:07:28 +0300
commit598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (patch)
tree675a2b01617549b539a4dcb1aec7141798e1f324 /arch/arm/mach-omap2
parent0bed4b7aa02c06e05121875dc443295d55b9d91d (diff)
parente679660dbb8347f275fe5d83a5dd59c1fb6c8e63 (diff)
downloadlinux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.tar.xz
Merge branches 'misc' and 'misc-rc6' into for-linus
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-generic.c12
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 @@
#include <linux/of_platform.h>
#include <linux/irqdomain.h>
+#include <asm/setup.h>
#include <asm/mach/arch.h>
#include "common.h"
@@ -76,8 +77,17 @@ static const char *const n900_boards_compat[] __initconst = {
NULL,
};
+/* 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));
+ omap_reserve();
+}
+
DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board")
- .reserve = omap_reserve,
+ .reserve = rx51_reserve,
.map_io = omap3_map_io,
.init_early = omap3430_init_early,
.init_machine = omap_generic_init,