e488245ea2da786842e9642f52d34b5e78ba92fc5572c5abc88ad759.patch

From 73a93ae6a3eac4094a61becfd804c0326a060ca6 Mon Sep 17 00:00:00 2001
From: Allen-kh Cheng <allen-kh.cheng@mediatek.corp-partner.google.com>
Date: Tue, 18 Jan 2022 20:45:32 +0800
Subject: [PATCH] CHROMIUM: Revert: "FROMLIST: drm/mediatek: add dsi module
 reset driver"

This reverts commit fc2ffae6300a87898ae021aa8cf38e8e655ade99.

BUG=b:204222699
TEST=BUILD PASSED

Signed-off-by: Allen-kh Cheng <allen-kh.cheng@mediatek.corp-partner.google.com>
Change-Id: If23955aac646fab356e4da1a5e9fe61dae78631e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3392829
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>
Tested-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
 drivers/gpu/drm/mediatek/mtk_dsi.c | 36 +-----------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -7,12 +7,10 @@
 #include <linux/component.h>
 #include <linux/iopoll.h>
 #include <linux/irq.h>
-#include <linux/mfd/syscon.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
-#include <linux/regmap.h>
 #include <linux/reset.h>
 
 #include <video/mipi_display.h>
@@ -146,8 +144,6 @@
 #define DATA_0				(0xff << 16)
 #define DATA_1				(0xff << 24)
 
-#define MMSYS_SW_RST_DSI_B BIT(25)
-
 #define NS_TO_CYCLE(n, c)    ((n) / (c) + (((n) % (c)) ? 1 : 0))
 
 #define MTK_DSI_HOST_IS_READ(type) \
@@ -192,8 +188,7 @@ struct mtk_dsi {
 	struct drm_connector *connector;
 	struct drm_panel *panel;
 	struct phy *phy;
-	struct regmap *mmsys_sw_rst_b;
-	u32 sw_rst_b;
+
 	void __iomem *regs;
 
 	struct clk *engine_clk;
@@ -281,16 +276,6 @@ static void mtk_dsi_disable(struct mtk_dsi *dsi)
 	mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_EN, 0);
 }
 
-static void mtk_dsi_reset_all(struct mtk_dsi *dsi)
-{
-	regmap_update_bits(dsi->mmsys_sw_rst_b, dsi->sw_rst_b,
-			   MMSYS_SW_RST_DSI_B, 0);
-	usleep_range(1000, 1100);
-
-	regmap_update_bits(dsi->mmsys_sw_rst_b, dsi->sw_rst_b,
-			   MMSYS_SW_RST_DSI_B, MMSYS_SW_RST_DSI_B);
-}
-
 static void mtk_dsi_reset_engine(struct mtk_dsi *dsi)
 {
 	mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, DSI_RESET);
@@ -1060,8 +1045,6 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
 	if (ret)
 		return ret;
 
-	mtk_dsi_reset_all(dsi);
-
 	return device_reset_optional(dev);
 }
 
@@ -1083,7 +1066,6 @@ static int mtk_dsi_probe(struct platform_device *pdev)
 	struct mtk_dsi *dsi;
 	struct device *dev = &pdev->dev;
 	struct resource *regs;
-	struct regmap *regmap;
 	int irq_num;
 	int ret;
 
@@ -1099,22 +1081,6 @@ static int mtk_dsi_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
-						 "mediatek,syscon-dsi");
-	ret = of_property_read_u32_index(dev->of_node, "mediatek,syscon-dsi", 1,
-					 &dsi->sw_rst_b);
-
-	if (IS_ERR(regmap))
-		ret = PTR_ERR(regmap);
-
-	if (ret) {
-		ret = PTR_ERR(regmap);
-		dev_err(dev, "Failed to get mmsys registers: %d\n", ret);
-		return ret;
-	}
-
-	dsi->mmsys_sw_rst_b = regmap;
-
 	ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
 					  &dsi->panel, &dsi->next_bridge);
 	if (ret)
-- 
2.35.0.rc0.227.g00780c9af4-goog