From bda57709c66a585b961a747eceb8decb34897a44 Mon Sep 17 00:00:00 2001 From: Ziyuan Xu Date: Mon, 23 Jun 2025 16:34:34 +0800 Subject: [PATCH] media: rockchip: cif/isp: subsys_initcall_sync as long as ROCKCHIP_THUNDER_BOOT_ISP=y The cif/isp depend on iommu, it's appropriate to set the one grader lower level. Signed-off-by: Ziyuan Xu Change-Id: Ie25e1ecafffff342b2a726cdc770ea6a90c10736 --- drivers/media/platform/rockchip/cif/hw.c | 4 ++-- drivers/media/platform/rockchip/isp/hw.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c index f4207b56b352..814c4555bc09 100644 --- a/drivers/media/platform/rockchip/cif/hw.c +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -2076,8 +2076,8 @@ static void __exit rk_cif_plat_drv_exit(void) rkcif_csi2_hw_plat_drv_exit(); } -#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) -subsys_initcall(rk_cif_plat_drv_init); +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) +subsys_initcall_sync(rk_cif_plat_drv_init); #else #if !defined(CONFIG_VIDEO_REVERSE_IMAGE) module_init(rk_cif_plat_drv_init); diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c index a450b9e35ea2..d1a8f6ffa8d2 100644 --- a/drivers/media/platform/rockchip/isp/hw.c +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -1682,8 +1682,8 @@ static void __exit rkisp_hw_drv_exit(void) platform_driver_unregister(&rkisp_hw_drv); } -#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) -subsys_initcall(rkisp_hw_drv_init); +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) +subsys_initcall_sync(rkisp_hw_drv_init); #else module_init(rkisp_hw_drv_init); #endif