On Thu 2018-11-08 13:50:24, Greg Kroah-Hartman wrote:
3.18-stable review patch. If anyone has any objections, please let me know.
[ Upstream commit 71c4f6027da75c6c1fd92e05b63108a09ec2b109 ]
N900 legacy user space apps need the board name in /proc/cpuinfo to work properly for the Hardware entry.
For other boards this should not be an issues and they can use the generic Hardware entry.
Let's fix the issue by adding a custom DT_MACHINE_START for n900.
Tested-by: Pali Rohár pali.rohar@gmail.com Acked-by: Pavel Machek pavel@ucw.cz Signed-off-by: Tony Lindgren tony@atomide.com Signed-off-by: Sasha Levin sashal@kernel.org
I don't think this is good idea. N900 support changed a lot in the meantime. It may not be neccessary or may break something, not sure. Not comfortable with this w/o testing.
Pavel
+++ 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",