Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47db3603 authored by Michael Ellerman's avatar Michael Ellerman Committed by Stephen Rothwell
Browse files

ppc64 iSeries: Move setup of systemcfg->platform into iSeries device tree 



Add /chosen/linux,platform to the device tree so we can remove iSeries
specific code in setup_system() to set systemcfg->platform.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 3ab42407

arch/ppc64/kernel/iSeries_setup.c

+5 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,11 @@ void build_flat_dt(struct iseries_flat_dt *dt) 
	dt_prop_u64_list(dt, "reg", tmp, 2);

	dt_end_node(dt);



	/* /chosen */

	dt_start_node(dt, "chosen");

	dt_prop_u32(dt, "linux,platform", PLATFORM_ISERIES_LPAR);

	dt_end_node(dt);



	dt_end_node(dt);



	dt_push_u32(dt, OF_DT_END);

arch/ppc64/kernel/setup.c

+0 −9
Original line number Diff line number Diff line
@@ -543,14 +543,6 @@ void __init setup_system(void) 
{

	DBG(" -> setup_system()\n");



#ifdef CONFIG_PPC_ISERIES

	/* pSeries systems are identified in prom.c via OF. */

	if (itLpNaca.xLparInstalled == 1)

		systemcfg->platform = PLATFORM_ISERIES_LPAR;



	ppc_md.init_early();

#else /* CONFIG_PPC_ISERIES */



	/*

	 * Unflatten the device-tree passed by prom_init or kexec

	 */
@@ -608,7 +600,6 @@ void __init setup_system(void) 
	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);



	parse_early_param();

#endif /* !CONFIG_PPC_ISERIES */



#ifdef CONFIG_SMP

	/*