From 38eb6ffd7e8704b8bfd9e555295f7f56b18fe447 Mon Sep 17 00:00:00 2001
From: Allon Huang <allon.huang@rock-chips.com>
Date: Tue, 13 Apr 2021 15:55:23 +0800
Subject: [PATCH] media: platform: rockchip: cif: register cif itf dev when
 clear unready subdev

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Icc051ac055cbfea78305327ebe8554d2d0963dc4
---
 drivers/media/platform/rockchip/cif/dev.c     | 27 +++++++++----------
 drivers/media/platform/rockchip/cif/dev.h     |  1 -
 drivers/media/platform/rockchip/cif/hw.c      |  4 ++-
 .../media/platform/rockchip/cif/subdev-itf.c  |  3 ++-
 drivers/media/platform/rockchip/cif/version.h |  1 +
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c
index fd2feb651dad..ce35ecf8cffa 100644
--- a/drivers/media/platform/rockchip/cif/dev.c
+++ b/drivers/media/platform/rockchip/cif/dev.c
@@ -587,14 +587,15 @@ static int _set_pipeline_default_fmt(struct rkcif_device *dev)
 	return 0;
 }
 
-static void subdev_itf_register_work(struct work_struct *work)
+static int subdev_asyn_register_itf(struct rkcif_device *dev)
 {
-	struct rkcif_device *dev = container_of(work,
-						struct rkcif_device,
-						async_register_work);
+	struct sditf_priv *sditf = dev->sditf;
+	int ret = 0;
 
-	if (dev->chip_id >= CHIP_RK1808_CIF)
-		platform_driver_register(&rkcif_subdev_driver);
+	if (sditf)
+		ret = v4l2_async_register_subdev_sensor_common(&sditf->sd);
+
+	return ret;
 }
 
 static int subdev_notifier_complete(struct v4l2_async_notifier *notifier)
@@ -681,14 +682,6 @@ static int subdev_notifier_complete(struct v4l2_async_notifier *notifier)
 	if (ret < 0)
 		goto unregister_lvds;
 
-	INIT_WORK(&dev->async_register_work, subdev_itf_register_work);
-	if (schedule_work(&dev->async_register_work))
-		v4l2_info(&dev->v4l2_dev,
-			 "async register subdev itf successfully\n");
-	else
-		v4l2_info(&dev->v4l2_dev,
-			 "async register subdev itf failed\n");
-
 	v4l2_info(&dev->v4l2_dev, "Async subdev notifier completed\n");
 
 	return ret;
@@ -1243,8 +1236,12 @@ static int __maybe_unused __rkcif_clr_unready_dev(void)
 	struct rkcif_device *cif_dev;
 
 	mutex_lock(&rkcif_dev_mutex);
-	list_for_each_entry(cif_dev, &rkcif_device_list, list)
+
+	list_for_each_entry(cif_dev, &rkcif_device_list, list) {
+		subdev_asyn_register_itf(cif_dev);
 		v4l2_async_notifier_clr_unready_dev(&cif_dev->notifier);
+	}
+
 	mutex_unlock(&rkcif_dev_mutex);
 
 	return 0;
diff --git a/drivers/media/platform/rockchip/cif/dev.h b/drivers/media/platform/rockchip/cif/dev.h
index cec0af9927b3..f88ab66eeef1 100644
--- a/drivers/media/platform/rockchip/cif/dev.h
+++ b/drivers/media/platform/rockchip/cif/dev.h
@@ -514,7 +514,6 @@ struct rkcif_device {
 	struct rkcif_work_struct	reset_work;
 	bool				reset_work_cancel;
 	struct rkcif_timer		reset_watchdog_timer;
-	struct work_struct		async_register_work;
 	unsigned int			buf_wake_up_cnt;
 
 	bool				iommu_en;
diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c
index b813d7e55db3..33077ef22932 100644
--- a/drivers/media/platform/rockchip/cif/hw.c
+++ b/drivers/media/platform/rockchip/cif/hw.c
@@ -943,8 +943,10 @@ static int rkcif_plat_hw_probe(struct platform_device *pdev)
 
 	if (data->chip_id == CHIP_RK1808_CIF ||
 	    data->chip_id == CHIP_RV1126_CIF ||
-	    data->chip_id == CHIP_RK3568_CIF)
+	    data->chip_id == CHIP_RK3568_CIF) {
 		platform_driver_register(&rkcif_plat_drv);
+		platform_driver_register(&rkcif_subdev_driver);
+	}
 
 	return 0;
 }
diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c
index 770f8a32cfe1..d2f510a11a6b 100644
--- a/drivers/media/platform/rockchip/cif/subdev-itf.c
+++ b/drivers/media/platform/rockchip/cif/subdev-itf.c
@@ -206,7 +206,8 @@ static int rkcif_subdev_media_init(struct sditf_priv *priv)
 		return ret;
 
 	strncpy(priv->sd.name, dev_name(cif_dev->dev), sizeof(priv->sd.name));
-	return v4l2_async_register_subdev(&priv->sd);
+
+	return 0;
 }
 
 static int rkcif_subdev_probe(struct platform_device *pdev)
diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h
index d806f3d8d5c7..0ff34f4aaeed 100644
--- a/drivers/media/platform/rockchip/cif/version.h
+++ b/drivers/media/platform/rockchip/cif/version.h
@@ -61,6 +61,7 @@
  *1. rv1126/rk356x support bt656/bt1120 multi channels function
  *2. add dynamic cropping function
  *3. optimize dts config of cif's pipeline
+ *4. register cif itf dev when clear unready subdev
  */
 
 #define RKCIF_DRIVER_VERSION RKCIF_API_VERSION