diff options
| author | Linus Walleij <[email protected]> | 2015-01-20 10:03:07 +0000 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2015-01-20 10:03:07 +0000 |
| commit | ee65ef609aa81539ac3792df88f04bfe29a77546 (patch) | |
| tree | 6816eaa3d45fa1078408f2ccfa5f88d32733d1d9 /arch/arm/mach-omap2/board-generic.c | |
| parent | Documentation: gpio: Add APM X-Gene standby GPIO controller DTS binding (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | kernel-ee65ef609aa81539ac3792df88f04bfe29a77546.tar.gz kernel-ee65ef609aa81539ac3792df88f04bfe29a77546.zip | |
Merge tag 'v3.19-rc5' into devel
Linux 3.19-rc5
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 608079a1aba6..b61c049f92d6 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -77,6 +77,24 @@ MACHINE_END #endif #ifdef CONFIG_ARCH_OMAP3 +/* Some boards need board name for legacy userspace in /proc/cpuinfo */ +static const char *const n900_boards_compat[] __initconst = { + "nokia,omap3-n900", + NULL, +}; + +DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") + .reserve = omap_reserve, + .map_io = omap3_map_io, + .init_early = omap3430_init_early, + .init_machine = omap_generic_init, + .init_late = omap3_init_late, + .init_time = omap3_sync32k_timer_init, + .dt_compat = n900_boards_compat, + .restart = omap3xxx_restart, +MACHINE_END + +/* Generic omap3 boards, most boards can use these */ static const char *const omap3_boards_compat[] __initconst = { "ti,omap3430", "ti,omap3", |