Revert "drm: atmel-hlcdc: enable sys_clk during initalization."

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>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1576672109-22707-7-git-send-email-claudiu.beznea@microchip.com

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 8dc917a..112aa50 100644 (file)
--- 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);