From 8c62e5fa384bb22d88c2aaf14ba8001d8e07758c Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Tue, 15 Apr 2025 19:53:52 +0800
Subject: [PATCH] nvmem: core: Call nvmem_init() early when
 CONFIG_INITCALL_ASYNC=y

rockchip_otp_init() depends on nvmem_init() to init nvmem_bus_type.
But rockchip_otp_init() and nvmem_init() are both in the same
subsys_initcall level.

Fix this by moving nvmem_init() to the arch_initcall_sync level.

Change-Id: If591d89572d77adbec06fe2cc2af23b1a4b239fd
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
---
 drivers/nvmem/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 53a6c4702078..2325f2de9af0 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -1948,7 +1948,7 @@ static void __exit nvmem_exit(void)
 	bus_unregister(&nvmem_bus_type);
 }
 
-#ifdef CONFIG_ROCKCHIP_THUNDER_BOOT
+#ifdef CONFIG_INITCALL_ASYNC
 arch_initcall_sync(nvmem_init);
 #else
 subsys_initcall(nvmem_init);