From d963dcb622af4f86ef1278ccdc4c5a01adef553a Mon Sep 17 00:00:00 2001 From: Ziyuan Xu Date: Mon, 23 Jun 2025 16:27:13 +0800 Subject: [PATCH] phy: rockchip: csi2-dphy[-hw]: Revise initcall when ROCKCHIP_THUNDER_BOOT_ISP=y The csi2-dphy depends on csi2-dphy-hw, assign different levels to them. No need to pay attention to INITCALL_ASYNC. Signed-off-by: Ziyuan Xu Change-Id: Ieda3c7737c4e07af3d9664ceee8868ba55dbefbe --- drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c | 2 +- drivers/phy/rockchip/phy-rockchip-csi2-dphy.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c index db265f27bcd3..4e96b19ac333 100644 --- a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c @@ -1394,7 +1394,7 @@ int rockchip_csi2_dphy_hw_init(void) return platform_driver_register(&rockchip_csi2_dphy_hw_driver); } -#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) subsys_initcall(rockchip_csi2_dphy_hw_init); #else #if !defined(CONFIG_VIDEO_REVERSE_IMAGE) diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c b/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c index b4a976e06f18..895d0d8fe849 100644 --- a/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c @@ -1276,8 +1276,8 @@ int rockchip_csi2_dphy_init(void) return platform_driver_register(&rockchip_csi2_dphy_driver); } -#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) -subsys_initcall(rockchip_csi2_dphy_init); +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) +subsys_initcall_sync(rockchip_csi2_dphy_init); #else #if !defined(CONFIG_VIDEO_REVERSE_IMAGE) module_platform_driver(rockchip_csi2_dphy_driver);