From 7326e495662b214cc71b1eab16677a570a112aea Mon Sep 17 00:00:00 2001
From: "changhuang.liang" <changhuang.liang@starfivetech.com>
Date: Mon, 29 Aug 2022 16:01:55 +0800
Subject: [PATCH] v4l2: modify v4l2 compatible name

dts/starfive: modify v4l2 compatible name

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>
---
 arch/riscv/boot/dts/starfive/jh7110-common.dtsi           | 6 +++---
 arch/riscv/boot/dts/starfive/jh7110.dtsi                  | 2 +-
 drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c | 2 +-
 drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c | 2 +-
 drivers/media/platform/starfive/v4l2_driver/sc2235.c      | 4 ++--
 drivers/media/platform/starfive/v4l2_driver/stfcamss.c    | 2 +-
 include/video/stf-vin.h                                   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
index 8de5586..212532b 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -206,7 +206,7 @@
 	status = "okay";
 
 	sc2235: sc2235@30 {
-		compatible = "sc2235";
+		compatible = "smartsens,sc2235";
 		reg = <0x30>;
 		clocks = <&clk_ext_camera>;
 		clock-names = "xclk";
@@ -277,8 +277,8 @@
 		};
 	};
 
-	imx219@10 {
-		compatible = "imx219";
+	imx219: imx219@10 {
+		compatible = "sony,imx219";
 		reg = <0x10>;
 		clocks = <&clk_ext_camera>;
 		clock-names = "xclk";
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index fc25056..61ac9a3 100755
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -873,7 +873,7 @@
 		};
 
 		vin_sysctl: vin_sysctl@19800000 {
-			compatible = "starfive,stf-vin";
+			compatible = "starfive,jh7110-vin";
 			reg = <0x0 0x19800000 0x0 0x10000>,
 				<0x0 0x19810000 0x0 0x10000>,
 				<0x0 0x19820000 0x0 0x10000>,
diff --git a/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c b/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
index 7c1de20..c6c80db 100644
--- a/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
@@ -1649,7 +1649,7 @@ static int imx219_remove(struct i2c_client *client)
 }
 
 static const struct of_device_id imx219_dt_ids[] = {
-	{ .compatible = "imx219" },
+	{ .compatible = "sony,imx219" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx219_dt_ids);
diff --git a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
index 25b54b2..211c24c 100644
--- a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
@@ -3006,7 +3006,7 @@ static int ov4689_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov4689_id[] = {
-	{"ov4689", 0},
+	{ "ov4689", 0 },
 	{},
 };
 MODULE_DEVICE_TABLE(i2c, ov4689_id);
diff --git a/drivers/media/platform/starfive/v4l2_driver/sc2235.c b/drivers/media/platform/starfive/v4l2_driver/sc2235.c
index c1a77f8..e50de3a6 100644
--- a/drivers/media/platform/starfive/v4l2_driver/sc2235.c
+++ b/drivers/media/platform/starfive/v4l2_driver/sc2235.c
@@ -1926,13 +1926,13 @@ static int sc2235_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id sc2235_id[] = {
-	{"sc2235", 0},
+	{ "sc2235", 0 },
 	{},
 };
 MODULE_DEVICE_TABLE(i2c, sc2235_id);
 
 static const struct of_device_id sc2235_dt_ids[] = {
-	{ .compatible = "sc2235" },
+	{ .compatible = "smartsens,sc2235" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sc2235_dt_ids);
diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
index 63f0d8e..f699766 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
@@ -1182,7 +1182,7 @@ static int stfcamss_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id stfcamss_of_match[] = {
-	{.compatible = "starfive,stf-vin"},
+	{ .compatible = "starfive,jh7110-vin" },
 	{ /* end node */ },
 };
 
diff --git a/include/video/stf-vin.h b/include/video/stf-vin.h
index ee1a716..bdae4aa 100755
--- a/include/video/stf-vin.h
+++ b/include/video/stf-vin.h
@@ -15,7 +15,7 @@
 
 #include <linux/cdev.h>
 
-#define DRV_NAME "stf-vin"
+#define DRV_NAME "jh7110-vin"
 #define FB_FIRST_ADDR      0xf9000000
 #define FB_SECOND_ADDR     0xf97e9000
 
-- 
2.7.4