1 files changed, 44 insertions, 16 deletions

diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index 29a8ff41595d..aad75a22dc33 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -145,8 +145,6 @@ struct meson_dw_hdmi {
         struct reset_control *hdmitx_apb;
         struct reset_control *hdmitx_ctrl;
         struct reset_control *hdmitx_phy;
-        struct clk *hdmi_pclk;
-        struct clk *venci_clk;
         struct regulator *hdmi_supply;
         u32 irq_stat;
         struct dw_hdmi *hdmi;
@@ -941,6 +939,34 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi)
 
 }
 
+static void meson_disable_regulator(void *data)
+{
+        regulator_disable(data);
+}
+
+static void meson_disable_clk(void *data)
+{
+        clk_disable_unprepare(data);
+}
+
+static int meson_enable_clk(struct device *dev, char *name)
+{
+        struct clk *clk;
+        int ret;
+
+        clk = devm_clk_get(dev, name);
+        if (IS_ERR(clk)) {
+                dev_err(dev, "Unable to get %s pclk\n", name);
+                return PTR_ERR(clk);
+        }
+
+        ret = clk_prepare_enable(clk);
+        if (!ret)
+                ret = devm_add_action_or_reset(dev, meson_disable_clk, clk);
+
+        return ret;
+}
+
 static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
                                 void *data)
 {
@@ -989,6 +1015,10 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
                 ret = regulator_enable(meson_dw_hdmi->hdmi_supply);
                 if (ret)
                         return ret;
+                ret = devm_add_action_or_reset(dev, meson_disable_regulator,
+                                               meson_dw_hdmi->hdmi_supply);
+                if (ret)
+                        return ret;
         }
 
         meson_dw_hdmi->hdmitx_apb = devm_reset_control_get_exclusive(dev,
@@ -1017,19 +1047,17 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
         if (IS_ERR(meson_dw_hdmi->hdmitx))
                 return PTR_ERR(meson_dw_hdmi->hdmitx);
 
-        meson_dw_hdmi->hdmi_pclk = devm_clk_get(dev, "isfr");
-        if (IS_ERR(meson_dw_hdmi->hdmi_pclk)) {
-                dev_err(dev, "Unable to get HDMI pclk\n");
-                return PTR_ERR(meson_dw_hdmi->hdmi_pclk);
-        }
-        clk_prepare_enable(meson_dw_hdmi->hdmi_pclk);
+        ret = meson_enable_clk(dev, "isfr");
+        if (ret)
+                return ret;
 
-        meson_dw_hdmi->venci_clk = devm_clk_get(dev, "venci");
-        if (IS_ERR(meson_dw_hdmi->venci_clk)) {
-                dev_err(dev, "Unable to get venci clk\n");
-                return PTR_ERR(meson_dw_hdmi->venci_clk);
-        }
-        clk_prepare_enable(meson_dw_hdmi->venci_clk);
+        ret = meson_enable_clk(dev, "iahb");
+        if (ret)
+                return ret;
+
+        ret = meson_enable_clk(dev, "venci");
+        if (ret)
+                return ret;
 
         dw_plat_data->regm = devm_regmap_init(dev, NULL, meson_dw_hdmi,
                                               &meson_dw_hdmi_regmap_config);
@@ -1062,10 +1090,10 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
 
         encoder->possible_crtcs = BIT(0);
 
-        DRM_DEBUG_DRIVER("encoder initialized\n");
-
         meson_dw_hdmi_init(meson_dw_hdmi);
 
+        DRM_DEBUG_DRIVER("encoder initialized\n");
+
         /* Bridge / Connector */
 
         dw_plat_data->priv_data = meson_dw_hdmi;