[PATCH 2/2] ARM: imx: mach-imx7ulp: warn when imx_soc_device_init fail
From: Peng Fan
Date: Wed Mar 13 2019 - 05:06:05 EST
Follow other i.MX6/7 machince code to check return value
of imx_soc_device_init and warn when fail.
Also drop of_platform_default_populate, because
"arch_initcall_sync(of_platform_default_populate_init);" could be
used to populate the device tree.
Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
---
arch/arm/mach-imx/mach-imx7ulp.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mach-imx7ulp.c b/arch/arm/mach-imx/mach-imx7ulp.c
index 11ac71aaf965..6d823f05d9aa 100644
--- a/arch/arm/mach-imx/mach-imx7ulp.c
+++ b/arch/arm/mach-imx/mach-imx7ulp.c
@@ -53,11 +53,16 @@ static void __init imx7ulp_set_revision(void)
static void __init imx7ulp_init_machine(void)
{
+ struct device *soc_dev;
+
+ soc_dev = imx_soc_device_init();
+ if (soc_dev == NULL)
+ pr_warn("failed to initialize soc device\n");
+
imx7ulp_pm_init();
mxc_set_cpu_type(MXC_CPU_IMX7ULP);
imx7ulp_set_revision();
- of_platform_default_populate(NULL, NULL, imx_soc_device_init());
}
static const char *const imx7ulp_dt_compat[] __initconst = {
--
2.16.4