diff options
| author |   Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2021-04-24 18:21:27 +0200 |
|---|---|---|
| committer |   Shawn Guo <shawnguo@kernel.org> | 2021-05-13 15:42:21 +0800 |
| commit | 22b5059b95e4d3b50bdd3e262182864a5ad7ec12 (patch) | |
| tree | 33897fa448d77ef89a1cc2b4ebd3e206a43f449f | |
| parent | ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info (diff) | |
| download | linux-dev-22b5059b95e4d3b50bdd3e262182864a5ad7ec12.tar.xz linux-dev-22b5059b95e4d3b50bdd3e262182864a5ad7ec12.zip | |
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: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/mach-imx/mach-imx50.c | 7 | ||||
| -rw-r--r-- | drivers/soc/imx/soc-imx.c | 3 | ||||
| -rw-r--r-- | include/soc/imx/cpu.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx50.c b/arch/arm/mach-imx/mach-imx50.c index f4da205f57db..a2d35f9ba474 100644 --- a/arch/arm/mach-imx/mach-imx50.c +++ b/arch/arm/mach-imx/mach-imx50.c @@ -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 diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c index 0738c0f36792..ac6d856ba228 100644 --- a/drivers/soc/imx/soc-imx.c +++ b/drivers/soc/imx/soc-imx.c @@ -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"; diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h index 42d6aeb951fa..0bf610acafd0 100644 --- a/include/soc/imx/cpu.h +++ b/include/soc/imx/cpu.h @@ -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 |