From ab3221eae86799203e1b2f7dec869e24a1c04cc1 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 22 Jun 2020 18:17:38 +0800 Subject: [PATCH] nvmem: core: Call nvmem_init() early when CONFIG_ROCKCHIP_THUNDER_BOOT=y rockchip_otp_module_init() depends on nvmem_init() to init nvmem_bus_type. But rockchip_otp_module_init() and nvmem_init() are both in the same subsys_initcall level. Change-Id: I58bc66519fb76179be3e6a170048a67c0861b224 Signed-off-by: Tao Huang --- drivers/nvmem/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 148f60eccfb7..8d55885c662b 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1400,7 +1400,11 @@ static void __exit nvmem_exit(void) bus_unregister(&nvmem_bus_type); } +#ifdef CONFIG_ROCKCHIP_THUNDER_BOOT +arch_initcall_sync(nvmem_init); +#else subsys_initcall(nvmem_init); +#endif module_exit(nvmem_exit); MODULE_AUTHOR("Srinivas Kandagatla