Commit 22b5059b authored by Jonathan Neuschäfer's avatar Jonathan Neuschäfer Committed by Shawn Guo
Browse files

ARM: imx: Initialize SoC ID on i.MX50 



As on i.MX51 and i.MX53, initialize the SoC ID based on the SoC
compatible string of the board.

Signed-off-by: default avatarJonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 89b75946

arch/arm/mach-imx/mach-imx50.c

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ 
#include <asm/mach/arch.h>



#include "common.h"

#include "hardware.h"



static void __init imx50_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX50);

}



static const char * const imx50_dt_board_compat[] __initconst = {

	"fsl,imx50",
@@ -16,5 +22,6 @@ static const char * const imx50_dt_board_compat[] __initconst = { 
};



DT_MACHINE_START(IMX50_DT, "Freescale i.MX50 (Device Tree Support)")

	.init_early	= imx50_init_early,

	.dt_compat	= imx50_dt_board_compat,

MACHINE_END

drivers/soc/imx/soc-imx.c

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ static int __init imx_soc_device_init(void) 
	case MXC_CPU_MX35:

		soc_id = "i.MX35";

		break;

	case MXC_CPU_MX50:

		soc_id = "i.MX50";

		break;

	case MXC_CPU_MX51:

		ocotp_compat = "fsl,imx51-iim";

		soc_id = "i.MX51";

include/soc/imx/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#define MXC_CPU_MX27		27

#define MXC_CPU_MX31		31

#define MXC_CPU_MX35		35

#define MXC_CPU_MX50		50

#define MXC_CPU_MX51		51

#define MXC_CPU_MX53		53

#define MXC_CPU_IMX6SL		0x60