Enable the DPU and DSI gate clocks specified in the device tree. Disable the DSI clock when it is not needed.
Signed-off-by: Otto Pflüger <otto.pflue...@abscue.de> --- drivers/gpu/drm/sprd/sprd_dpu.c | 7 +++++++ drivers/gpu/drm/sprd/sprd_dpu.h | 1 + drivers/gpu/drm/sprd/sprd_dsi.c | 10 ++++++++++ drivers/gpu/drm/sprd/sprd_dsi.h | 4 +++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sprd/sprd_dpu.c b/drivers/gpu/drm/sprd/sprd_dpu.c index 0d9eb778794d92418b39f8535d94abde3566de43..575bcdb0e0bb30055ac5c3d0e65178cc9f6611f3 100644 --- a/drivers/gpu/drm/sprd/sprd_dpu.c +++ b/drivers/gpu/drm/sprd/sprd_dpu.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Unisoc Inc. */ +#include <linux/clk.h> #include <linux/component.h> #include <linux/delay.h> #include <linux/dma-buf.h> @@ -794,6 +795,12 @@ static int sprd_dpu_context_init(struct sprd_dpu *dpu, if (ctx->irq < 0) return ctx->irq; + ctx->clk = devm_clk_get_optional_enabled(dev, "enable"); + if (IS_ERR(ctx->clk)) { + dev_err(dev, "failed to get dpu enable clock\n"); + return PTR_ERR(ctx->clk); + } + /* disable and clear interrupts before register dpu IRQ. */ writel(0x00, ctx->base + REG_DPU_INT_EN); writel(0xff, ctx->base + REG_DPU_INT_CLR); diff --git a/drivers/gpu/drm/sprd/sprd_dpu.h b/drivers/gpu/drm/sprd/sprd_dpu.h index 157a78f24dc18b071602552ea9d005af66525263..d48b922de580a8a4bf07c4610c431d3321f7b810 100644 --- a/drivers/gpu/drm/sprd/sprd_dpu.h +++ b/drivers/gpu/drm/sprd/sprd_dpu.h @@ -44,6 +44,7 @@ enum { */ struct dpu_context { void __iomem *base; + struct clk *clk; int irq; u8 if_type; struct videomode vm; diff --git a/drivers/gpu/drm/sprd/sprd_dsi.c b/drivers/gpu/drm/sprd/sprd_dsi.c index e01d1d28fe579644ec2e0c83ec9170269932adfe..e781e6c84860402f37352e768244d88ca6ffd4c9 100644 --- a/drivers/gpu/drm/sprd/sprd_dsi.c +++ b/drivers/gpu/drm/sprd/sprd_dsi.c @@ -828,6 +828,8 @@ static void sprd_dsi_bridge_pre_enable(struct drm_bridge *bridge) struct sprd_dsi *dsi = bridge_to_dsi(bridge); struct dsi_context *ctx = &dsi->ctx; + clk_prepare_enable(ctx->clk); + if (ctx->enabled) { drm_warn(dsi->drm, "dsi is initialized\n"); return; @@ -875,6 +877,8 @@ static void sprd_dsi_bridge_post_disable(struct drm_bridge *bridge) sprd_dphy_fini(ctx); sprd_dsi_fini(ctx); + clk_disable_unprepare(ctx->clk); + ctx->enabled = false; } @@ -1098,6 +1102,12 @@ static int sprd_dsi_probe(struct platform_device *pdev) if (!dsi->ctx.pll.platform) return -EINVAL; + dsi->ctx.clk = devm_clk_get_optional(dev, "enable"); + if (IS_ERR(dsi->ctx.clk)) { + dev_err(dev, "failed to get dsi enable clock\n"); + return PTR_ERR(dsi->ctx.clk); + } + return mipi_dsi_host_register(&dsi->host); } diff --git a/drivers/gpu/drm/sprd/sprd_dsi.h b/drivers/gpu/drm/sprd/sprd_dsi.h index 0b9f1cabe71570743cbc68a8061e95a249f27191..15e57f3f49f8e5c4f856fb496a0c88f1b0414ced 100644 --- a/drivers/gpu/drm/sprd/sprd_dsi.h +++ b/drivers/gpu/drm/sprd/sprd_dsi.h @@ -6,8 +6,9 @@ #ifndef __SPRD_DSI_H__ #define __SPRD_DSI_H__ -#include <linux/of.h> +#include <linux/clk.h> #include <linux/device.h> +#include <linux/of.h> #include <linux/regmap.h> #include <video/videomode.h> @@ -95,6 +96,7 @@ struct dphy_pll { struct dsi_context { void __iomem *base; struct regmap *regmap; + struct clk *clk; struct dphy_pll pll; struct videomode vm; bool enabled; -- 2.50.0