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

Commit 8f2068bc authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle
Browse files

MIPS: Octeon: Initialize system type string after device tree init. 



Initialize system type string after device tree init.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12583/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6ecffafe

arch/mips/cavium-octeon/setup.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -464,7 +464,7 @@ static void octeon_halt(void) 




static char __read_mostly octeon_system_type[80];

static char __read_mostly octeon_system_type[80];





static int __init init_octeon_system_type(void)

static void __init init_octeon_system_type(void)

{

{

	char const *board_type;

	char const *board_type;
@@ -474,10 +474,7 @@ static int __init init_octeon_system_type(void) 




	snprintf(octeon_system_type, sizeof(octeon_system_type), "%s (%s)",

	snprintf(octeon_system_type, sizeof(octeon_system_type), "%s (%s)",

		 board_type, octeon_model_get_string(read_c0_prid()));

		 board_type, octeon_model_get_string(read_c0_prid()));



	return 0;

}

}

early_initcall(init_octeon_system_type);





/**

/**

 * Return a string representing the system type

 * Return a string representing the system type
@@ -1141,6 +1138,7 @@ void __init device_tree_init(void) 
		pr_info("Using internal Device Tree.\n");

		pr_info("Using internal Device Tree.\n");

	}

	}

	unflatten_and_copy_device_tree();

	unflatten_and_copy_device_tree();

	init_octeon_system_type();

}

}





static int __initdata disable_octeon_edac_p;

static int __initdata disable_octeon_edac_p;