--- /dev/null
+From devnull+jason-jh.lin.mediatek.com@kernel.org Wed Nov 6 09:04:26 2024
+From: "Jason-JH.Lin via B4 Relay" <devnull+jason-jh.lin.mediatek.com@kernel.org>
+Date: Tue, 29 Oct 2024 09:24:53 +0800
+Subject: Revert "drm/mipi-dsi: Set the fwnode for mipi_dsi_device"
+To: stable@vger.kernel.org, Saravana Kannan <saravanak@google.com>, Greg KH <gregkh@linuxfoundation.org>
+Cc: Seiya Wang <seiya.wang@mediatek.com>, "Jason-JH.Lin" <jason-jh.lin@mediatek.com>, Singo Chang <singo.chang@mediatek.com>
+Message-ID: <20241029-fixup-5-15-v4-1-a61fab4fd6b4@mediatek.com>
+
+From: "Jason-JH.Lin" <jason-jh.lin@mediatek.com>
+
+This reverts commit 139c27648f8d3b2283f74715d8e7f0df7f5e55ca which is
+commit a26cc2934331b57b5a7164bff344f0a2ec245fc0 upstream.
+
+Reason for revert:
+1. The commit [1] does not land on linux-5.15, so this patch does not
+fix anything.
+
+2. Since the fw_devlink improvements series [2] does not land on
+linux-5.15, using device_set_fwnode() causes the panel to flash during
+bootup.
+
+Incorrect link management may lead to incorrect device initialization,
+affecting firmware node links and consumer relationships.
+The fwnode setting of panel to the DSI device would cause a DSI
+initialization error without series[2], so this patch was reverted to
+avoid using the incomplete fw_devlink functionality.
+
+[1] commit 3fb16866b51d ("driver core: fw_devlink: Make cycle detection more robust")
+[2] Link: https://lore.kernel.org/all/20230207014207.1678715-1-saravanak@google.com
+
+Cc: stable@vger.kernel.org # 5.15.169
+Cc: stable@vger.kernel.org # 5.10.228
+Cc: stable@vger.kernel.org # 5.4.284
+Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/drm_mipi_dsi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_mipi_dsi.c
++++ b/drivers/gpu/drm/drm_mipi_dsi.c
+@@ -221,7 +221,7 @@ mipi_dsi_device_register_full(struct mip
+ return dsi;
+ }
+
+- device_set_node(&dsi->dev, of_fwnode_handle(info->node));
++ dsi->dev.of_node = info->node;
+ dsi->channel = info->channel;
+ strlcpy(dsi->name, info->type, sizeof(dsi->name));
+