mirror of
https://github.com/kernelkit/infix.git
synced 2026-07-22 01:13:00 +02:00
63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
From 1d7fe70e06f361fa24b90c96d3aea15b904b5638 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 8 Jun 2022 17:23:47 +0100
|
|
Subject: [PATCH 35/50] drm: vc4: dsi: Clocks should be running before reset
|
|
|
|
The initialisation sequence differs slightly from the documentation
|
|
in that the clocks are meant to be running before resets and
|
|
similar.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_dsi.c | 30 +++++++++++++++---------------
|
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
index 439d7a04127d..1eba498d276f 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
@@ -926,6 +926,21 @@ static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
|
|
"Failed to set phy clock to %ld: %d\n", phy_clock, ret);
|
|
}
|
|
|
|
+ ret = clk_prepare_enable(dsi->escape_clock);
|
|
+ if (ret) {
|
|
+ drm_err(bridge->dev, "Failed to turn on DSI escape clock: %d\n",
|
|
+ ret);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ ret = clk_prepare_enable(dsi->pll_phy_clock);
|
|
+ if (ret) {
|
|
+ drm_err(bridge->dev, "Failed to turn on DSI PLL: %d\n", ret);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ hs_clock = clk_get_rate(dsi->pll_phy_clock);
|
|
+
|
|
/* Reset the DSI and all its fifos. */
|
|
DSI_PORT_WRITE(CTRL,
|
|
DSI_CTRL_SOFT_RESET_CFG |
|
|
@@ -984,21 +999,6 @@ static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
|
|
mdelay(1);
|
|
}
|
|
|
|
- ret = clk_prepare_enable(dsi->escape_clock);
|
|
- if (ret) {
|
|
- drm_err(bridge->dev, "Failed to turn on DSI escape clock: %d\n",
|
|
- ret);
|
|
- return;
|
|
- }
|
|
-
|
|
- ret = clk_prepare_enable(dsi->pll_phy_clock);
|
|
- if (ret) {
|
|
- drm_err(bridge->dev, "Failed to turn on DSI PLL: %d\n", ret);
|
|
- return;
|
|
- }
|
|
-
|
|
- hs_clock = clk_get_rate(dsi->pll_phy_clock);
|
|
-
|
|
/* Yes, we set the DSI0P/DSI1P pixel clock to the byte rate,
|
|
* not the pixel clock rate. DSIxP take from the APHY's byte,
|
|
* DDR2, or DDR4 clock (we use byte) and feed into the PV at
|