media: i2c: revise initcall for tb-sensors when ROCKCHIP_THUNDER_BOOT_ISP=y

The csi2-dphy depends on them. Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> Change-Id: Id4a6cc1526e57ecdccc74d511e5f8d141757a44e
2026-06-05 18:41:58 +09:00 · 2025-06-23 16:57:16 +08:00
parent bda57709c6
commit ebac3dcdbe
22 changed files with 23 additions and 23 deletions
--- a/drivers/media/i2c/gc2093.c
+++ b/drivers/media/i2c/gc2093.c
@@ -1858,7 +1858,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&gc2093_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/gc3003.c
+++ b/drivers/media/i2c/gc3003.c
@@ -2056,7 +2056,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&gc3003_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/mis2031.c
+++ b/drivers/media/i2c/mis2031.c
@@ -1640,7 +1640,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&mis2031_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/os02k10.c
+++ b/drivers/media/i2c/os02k10.c
@@ -2282,7 +2282,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&os02k10_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/os04d10.c
+++ b/drivers/media/i2c/os04d10.c
@@ -1904,7 +1904,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&os04d10_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/ps5458.c
+++ b/drivers/media/i2c/ps5458.c
@@ -2158,7 +2158,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&ps5458_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc1346.c
+++ b/drivers/media/i2c/sc1346.c
@@ -1494,7 +1494,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc1346_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc200ai.c
+++ b/drivers/media/i2c/sc200ai.c
@@ -2185,7 +2185,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc200ai_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc223a.c
+++ b/drivers/media/i2c/sc223a.c
@@ -1869,7 +1869,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc223a_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc230ai.c
+++ b/drivers/media/i2c/sc230ai.c
@@ -1888,7 +1888,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc230ai_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc2336.c
+++ b/drivers/media/i2c/sc2336.c
@@ -1547,7 +1547,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc2336_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc301iot.c
+++ b/drivers/media/i2c/sc301iot.c
@@ -2321,7 +2321,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc301iot_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc3336.c
+++ b/drivers/media/i2c/sc3336.c
@@ -1723,7 +1723,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc3336_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc3336p.c
+++ b/drivers/media/i2c/sc3336p.c
@@ -1910,7 +1910,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc3336p_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc3338.c
+++ b/drivers/media/i2c/sc3338.c
@@ -716,7 +716,7 @@ static long sc3338_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
 			memcpy(&sc3338->cam_sw_inf->hdr_ae, (struct preisp_hdrae_exp_s *)(arg),
 				sizeof(struct preisp_hdrae_exp_s));
 		break;
-	case RKMODULE_SET_QUICK_STREAM:
+	case RKMODULE_SET_QUICK_STREAM:;

 		stream = *((u32 *)arg);

@@ -1591,7 +1591,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc3338_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc401ai.c
+++ b/drivers/media/i2c/sc401ai.c
@@ -1761,7 +1761,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc401ai_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc4336.c
+++ b/drivers/media/i2c/sc4336.c
@@ -1582,7 +1582,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc4336_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc4336p.c
+++ b/drivers/media/i2c/sc4336p.c
@@ -1575,7 +1575,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc4336p_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc450ai.c
+++ b/drivers/media/i2c/sc450ai.c
@@ -3139,7 +3139,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc450ai_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc501ai.c
+++ b/drivers/media/i2c/sc501ai.c
@@ -1422,7 +1422,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc501ai_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc5336.c
+++ b/drivers/media/i2c/sc5336.c
@@ -1595,7 +1595,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc5336_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);
--- a/drivers/media/i2c/sc635hai.c
+++ b/drivers/media/i2c/sc635hai.c
@@ -2964,7 +2964,7 @@ static void __exit sensor_mod_exit(void)
 	i2c_del_driver(&sc635hai_i2c_driver);
 }

-#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC)
+#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)
 subsys_initcall(sensor_mod_init);
 #else
 device_initcall_sync(sensor_mod_init);