diff options
| -rw-r--r-- | drivers/gpu/drm/bridge/nwl-dsi.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/imx/nwl_dsi-imx.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c index a7d9e9c41588..5ed93df85d64 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -1080,7 +1080,6 @@ static void nwl_dsi_bridge_disable(struct drm_bridge *bridge) phy_power_off(dsi->phy); phy_exit(dsi->phy); - nwl_dsi_disable_clocks(dsi, CLK_PHY_REF | CLK_TX_ESC); devm_free_irq(dev, dsi->irq, dsi); dsi->enabled = false; diff --git a/drivers/gpu/drm/imx/nwl_dsi-imx.c b/drivers/gpu/drm/imx/nwl_dsi-imx.c index e97b17431332..95d2570b4517 100644 --- a/drivers/gpu/drm/imx/nwl_dsi-imx.c +++ b/drivers/gpu/drm/imx/nwl_dsi-imx.c @@ -39,6 +39,7 @@ #include "imx-drm.h" #define DRIVER_NAME "nwl_dsi-imx" +#define NO_CLK_RESET /* 8MQ SRC specific registers */ #define SRC_MIPIPHY_RCR 0x28 @@ -450,6 +451,7 @@ static int imx8mq_dsi_poweron(struct imx_mipi_dsi *dsi) static int imx8mq_dsi_poweroff(struct imx_mipi_dsi *dsi) { +#ifndef NO_CLK_RESET regmap_update_bits(dsi->reset, SRC_MIPIPHY_RCR, PCLK_RESET_N, 0); regmap_update_bits(dsi->reset, SRC_MIPIPHY_RCR, @@ -458,6 +460,7 @@ static int imx8mq_dsi_poweroff(struct imx_mipi_dsi *dsi) RESET_BYTE_N, 0); regmap_update_bits(dsi->reset, SRC_MIPIPHY_RCR, DPI_RESET_N, 0); +#endif return 0; } |