ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic (46c1bf81) · Commits · 戴 / test

The u8500 and u9540 DT_MACHINE_START calls are almost identical at the moment, referencing exactly the same function pointers. Until this changes we may as well convert the original one to be more generic and use that instead. Acked-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

arch/arm/mach-ux500/cpu-db8500.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ static const char * u8500_dt_board_compat[] = {
		NULL,
		};

		DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
		DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
		.map_io = u8500_map_io,
		.init_irq = ux500_init_irq,
		/* we re-use nomadik timer here */
		@@ -349,14 +349,4 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
		.dt_compat = u8500_dt_board_compat,
		MACHINE_END

		DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
		.map_io = u8500_map_io,
		.init_irq = ux500_init_irq,
		.timer = &ux500_timer,
		.handle_irq = gic_handle_irq,
		.init_machine = u8500_init_machine,
		.init_late = NULL,
		.dt_compat = u8500_dt_board_compat,
		MACHINE_END

		#endif

Admin message