From: Claudiu Beznea <claudiu.beznea@microchip.com>
To: <boris.brezillon@bootlin.com>, <airlied@linux.ie>,
<nicolas.ferre@microchip.com>, <alexandre.belloni@bootlin.com>,
<lee.jones@linaro.org>, <sam@ravnborg.org>
Cc: <peda@axentia.se>, <dri-devel@lists.freedesktop.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Claudiu Beznea <claudiu.beznea@microchip.com>,
Sandeep Sheriker Mallikarjun
<sandeepsheriker.mallikarjun@microchip.com>
Subject: [PATCH v3 6/6] Revert "drm: atmel-hlcdc: enable sys_clk during initalization."
Date: Wed, 18 Dec 2019 14:28:29 +0200 [thread overview]
Message-ID: <1576672109-22707-7-git-send-email-claudiu.beznea@microchip.com> (raw)
In-Reply-To: <1576672109-22707-1-git-send-email-claudiu.beznea@microchip.com>
This reverts commit d2c755e66617620b729041c625a6396c81d1231c
("drm: atmel-hlcdc: enable sys_clk during initalization."). With
commit "drm: atmel-hlcdc: enable clock before configuring timing engine"
there is no need for this patch. Code is also simpler.
Cc: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
Hi Sam,
I still kept this as a patch as I didn't got any answer from you at my
last email up to this moment.
If you think it is better to squash this one with patch 2/6 in this seris
let me know.
Thank you,
Claudiu Beznea
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 8dc917a1270b..112aa5066cee 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -721,18 +721,10 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)
dc->hlcdc = dev_get_drvdata(dev->dev->parent);
dev->dev_private = dc;
- if (dc->desc->fixed_clksrc) {
- ret = clk_prepare_enable(dc->hlcdc->sys_clk);
- if (ret) {
- dev_err(dev->dev, "failed to enable sys_clk\n");
- goto err_destroy_wq;
- }
- }
-
ret = clk_prepare_enable(dc->hlcdc->periph_clk);
if (ret) {
dev_err(dev->dev, "failed to enable periph_clk\n");
- goto err_sys_clk_disable;
+ goto err_destroy_wq;
}
pm_runtime_enable(dev->dev);
@@ -768,9 +760,6 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)
err_periph_clk_disable:
pm_runtime_disable(dev->dev);
clk_disable_unprepare(dc->hlcdc->periph_clk);
-err_sys_clk_disable:
- if (dc->desc->fixed_clksrc)
- clk_disable_unprepare(dc->hlcdc->sys_clk);
err_destroy_wq:
destroy_workqueue(dc->wq);
@@ -795,8 +784,6 @@ static void atmel_hlcdc_dc_unload(struct drm_device *dev)
pm_runtime_disable(dev->dev);
clk_disable_unprepare(dc->hlcdc->periph_clk);
- if (dc->desc->fixed_clksrc)
- clk_disable_unprepare(dc->hlcdc->sys_clk);
destroy_workqueue(dc->wq);
}
@@ -910,8 +897,6 @@ static int atmel_hlcdc_dc_drm_suspend(struct device *dev)
regmap_read(regmap, ATMEL_HLCDC_IMR, &dc->suspend.imr);
regmap_write(regmap, ATMEL_HLCDC_IDR, dc->suspend.imr);
clk_disable_unprepare(dc->hlcdc->periph_clk);
- if (dc->desc->fixed_clksrc)
- clk_disable_unprepare(dc->hlcdc->sys_clk);
return 0;
}
@@ -921,8 +906,6 @@ static int atmel_hlcdc_dc_drm_resume(struct device *dev)
struct drm_device *drm_dev = dev_get_drvdata(dev);
struct atmel_hlcdc_dc *dc = drm_dev->dev_private;
- if (dc->desc->fixed_clksrc)
- clk_prepare_enable(dc->hlcdc->sys_clk);
clk_prepare_enable(dc->hlcdc->periph_clk);
regmap_write(dc->hlcdc->regmap, ATMEL_HLCDC_IER, dc->suspend.imr);
--
2.7.4
next prev parent reply other threads:[~2019-12-18 12:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 12:28 [PATCH v3 0/6] fixes for atmel-hlcdc Claudiu Beznea
2019-12-18 12:28 ` [PATCH v3 1/6] drm: atmel-hlcdc: use double rate for pixel clock only if supported Claudiu Beznea
2019-12-18 12:28 ` [PATCH v3 2/6] drm: atmel-hlcdc: enable clock before configuring timing engine Claudiu Beznea
2019-12-18 12:28 ` [PATCH v3 3/6] mfd: atmel-hlcdc: add struct device member to struct atmel_hlcdc_regmap Claudiu Beznea
2019-12-18 12:28 ` [PATCH v3 4/6] mfd: atmel-hlcdc: return in case of error Claudiu Beznea
2020-01-07 10:18 ` Lee Jones
2019-12-18 12:28 ` [PATCH v3 5/6] drm: atmel-hlcdc: prefer a lower pixel-clock than requested Claudiu Beznea
2020-01-02 9:08 ` Sam Ravnborg
2020-01-04 17:12 ` Sam Ravnborg
2020-01-06 9:25 ` Claudiu.Beznea
2020-01-06 19:02 ` Sam Ravnborg
2020-01-06 9:24 ` Claudiu.Beznea
2020-01-07 9:19 ` Peter Rosin
2019-12-18 12:28 ` Claudiu Beznea [this message]
2020-01-02 9:05 ` [PATCH v3 0/6] fixes for atmel-hlcdc Sam Ravnborg
2020-01-02 16:05 ` Lee Jones
2020-01-02 16:21 ` Sam Ravnborg
2020-01-06 19:37 ` Sam Ravnborg
2020-01-07 10:17 ` [GIT PULL] Immutable branch between MFD and DRM due for the v5.6 merge window Lee Jones
2020-01-07 18:21 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1576672109-22707-7-git-send-email-claudiu.beznea@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=airlied@linux.ie \
--cc=alexandre.belloni@bootlin.com \
--cc=boris.brezillon@bootlin.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=peda@axentia.se \
--cc=sam@ravnborg.org \
--cc=sandeepsheriker.mallikarjun@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).