linux:arch:riscv:boot:dts:starfive

linux:driver:gpu:drm:starfive

fix vout compile warning

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>

5 files changed, 6 insertions, 33 deletions

diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
index eb3bbe110dc3..a59aea9ed553 100644
--- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
@@ -123,7 +123,7 @@
 		port@1 {
 			reg = <1>;
 			mipi_out: endpoint {
-				remote-endpoint = <&dsi_out_port>;
+				remote-endpoint = <&dsi_in_port>;
 			};
 		};
 
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
index 08c22b2445ec..5b233f74bfc5 100755..100644
--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
@@ -793,9 +793,12 @@
 			reg-names = "dsi";
 
 			port {
-				dsi_out_port: endpoint {
+				dsi_out_port: endpoint@0 {
 					remote-endpoint = <&panel_dsi_port>;
 				};
+				dsi_in_port: endpoint@1 {
+					remote-endpoint = <&mipi_out>;
+				};
 			};
 			mipi_panel: panel@0 {
 				//compatible = "";
diff --git a/drivers/gpu/drm/starfive/starfive_drm_dsi.c b/drivers/gpu/drm/starfive/starfive_drm_dsi.c
index 2ace15113126..8ab16fe5697c 100644
--- a/drivers/gpu/drm/starfive/starfive_drm_dsi.c
+++ b/drivers/gpu/drm/starfive/starfive_drm_dsi.c
@@ -1020,24 +1020,6 @@ static int cdns_dsi_detach(struct mipi_dsi_host *host,
 	return 0;
 }
 
-static irqreturn_t cdns_dsi_interrupt(int irq, void *data)
-{
-	struct cdns_dsi *dsi = data;
-	irqreturn_t ret = IRQ_NONE;
-	u32 flag, ctl;
-
-	flag = readl(dsi->regs + DIRECT_CMD_STS_FLAG);
-	if (flag) {
-		ctl = readl(dsi->regs + DIRECT_CMD_STS_CTL);
-		ctl &= ~flag;
-		writel(ctl, dsi->regs + DIRECT_CMD_STS_CTL);
-		complete(&dsi->direct_cmd_comp);
-		ret = IRQ_HANDLED;
-	}
-
-	return ret;
-}
-
 static ssize_t cdns_dsi_transfer(struct mipi_dsi_host *host,
 				 const struct mipi_dsi_msg *msg)
 {
@@ -1169,16 +1151,6 @@ static int __maybe_unused cdns_dsi_suspend(struct device *dev)
 static UNIVERSAL_DEV_PM_OPS(cdns_dsi_pm_ops, cdns_dsi_suspend, cdns_dsi_resume,
 			    NULL);
 
-static int cdns_dsi_drm_remove(struct platform_device *pdev)
-{
-	struct cdns_dsi *dsi = platform_get_drvdata(pdev);
-
-	mipi_dsi_host_unregister(&dsi->base);
-	pm_runtime_disable(&pdev->dev);
-
-	return 0;
-}
-
 static const struct of_device_id cdns_dsi_of_match[] = {
 	{ .compatible = "cdns,dsi" },
 	{ },
diff --git a/drivers/gpu/drm/starfive/starfive_drm_encoder.c b/drivers/gpu/drm/starfive/starfive_drm_encoder.c
index 04d00da89f59..929c5a83027c 100644
--- a/drivers/gpu/drm/starfive/starfive_drm_encoder.c
+++ b/drivers/gpu/drm/starfive/starfive_drm_encoder.c
@@ -105,7 +105,7 @@ err_encoder:
 
 static void starfive_encoder_unbind(struct device *dev, struct device *master, void *data)
 {
-	struct starfive_encoder *encoderp = dev_get_drvdata(dev);
+	DRM_INFO("starfive_encoder_unbind\n");
 }
 
 static const struct component_ops starfive_encoder_component_ops = {
diff --git a/drivers/phy/m31/phy-m31-dphy-tx0.c b/drivers/phy/m31/phy-m31-dphy-tx0.c
index e82e1da50c66..2bd8e43f1338 100644
--- a/drivers/phy/m31/phy-m31-dphy-tx0.c
+++ b/drivers/phy/m31/phy-m31-dphy-tx0.c
@@ -484,8 +484,6 @@ static int sf_dphy_probe(struct platform_device *pdev)
 {
 	struct phy_provider *phy_provider;
 	struct sf_dphy *dphy;
-	struct resource *res;
-	int ret;
 	dphy = devm_kzalloc(&pdev->dev, sizeof(*dphy), GFP_KERNEL);
 	if (!dphy)
 		return -ENOMEM;