Revert "video: tegra: Add HDA clock management"

This reverts commit ec6673c1d2021df64e3920cc9c6a06e52e9ffbcb.

Revert this commit since HDA clock names will be changed in order
to add support for HDA driver.

Bug 872652

Change-Id: Ia4899672899189f199fae63a454b178dc29af812
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-on: http://git-master/r/59617
Reviewed-by: Scott Peterson <speterson@nvidia.com>

Rebase-Id: R81e80436981bd78f47b20f2a24efd5d9d2a01cca

1 files changed, 0 insertions, 51 deletions

diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 8152aed3b82b..708d989b473d 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -76,9 +76,6 @@ struct tegra_dc_hdmi_data {
 
 	struct clk			*disp1_clk;
 	struct clk			*disp2_clk;
-	struct clk			*hda_clk;
-	struct clk			*hda2codec_clk;
-	struct clk			*hda2hdmicodec_clk;
 
 	spinlock_t			suspend_lock;
 	bool				suspended;
@@ -907,29 +904,6 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc)
 		goto err_put_clock;
 	}
 
-#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
-	hdmi->hda_clk = clk_get_sys("hda", NULL);
-	if (IS_ERR_OR_NULL(hdmi->hda_clk)) {
-		dev_err(&dc->ndev->dev, "hdmi: can't get hda clock\n");
-		err = -ENOENT;
-		goto err_put_clock;
-	}
-
-	hdmi->hda2codec_clk = clk_get_sys("hda2codec_2x", NULL);
-	if (IS_ERR_OR_NULL(hdmi->hda2codec_clk)) {
-		dev_err(&dc->ndev->dev, "hdmi: can't get hda2codec clock\n");
-		err = -ENOENT;
-		goto err_put_clock;
-	}
-
-	hdmi->hda2hdmicodec_clk = clk_get_sys("hda2hdmi", NULL);
-	if (IS_ERR_OR_NULL(hdmi->hda2hdmicodec_clk)) {
-		dev_err(&dc->ndev->dev, "hdmi: can't get hda2hdmi clock\n");
-		err = -ENOENT;
-		goto err_put_clock;
-	}
-#endif
-
 	/* TODO: support non-hotplug */
 	if (request_irq(gpio_to_irq(dc->out->hotplug_gpio), tegra_dc_hdmi_irq,
 			IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
@@ -993,14 +967,6 @@ err_edid_destroy:
 err_free_irq:
 	free_irq(gpio_to_irq(dc->out->hotplug_gpio), dc);
 err_put_clock:
-#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
-	if (!IS_ERR_OR_NULL(hdmi->hda2hdmicodec_clk))
-		clk_put(hdmi->hda2hdmicodec_clk);
-	if (!IS_ERR_OR_NULL(hdmi->hda2codec_clk))
-		clk_put(hdmi->hda2codec_clk);
-	if (!IS_ERR_OR_NULL(hdmi->hda_clk))
-		clk_put(hdmi->hda_clk);
-#endif
 	if (!IS_ERR_OR_NULL(disp2_clk))
 		clk_put(disp2_clk);
 	if (!IS_ERR_OR_NULL(disp1_clk))
@@ -1024,11 +990,6 @@ static void tegra_dc_hdmi_destroy(struct tegra_dc *dc)
 	cancel_delayed_work_sync(&hdmi->work);
 	iounmap(hdmi->base);
 	release_resource(hdmi->base_res);
-#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
-	clk_put(hdmi->hda2hdmicodec_clk);
-	clk_put(hdmi->hda2codec_clk);
-	clk_put(hdmi->hda_clk);
-#endif
 	clk_put(hdmi->clk);
 	clk_put(hdmi->disp1_clk);
 	clk_put(hdmi->disp2_clk);
@@ -1471,13 +1432,6 @@ static void tegra_dc_hdmi_enable(struct tegra_dc *dc)
 	clk_enable(hdmi->disp1_clk);
 	clk_enable(hdmi->disp2_clk);
 
-#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
-	/* Enabling HDA clocks before asserting HDA PD and ELDV bits */
-	clk_enable(hdmi->hda_clk);
-	clk_enable(hdmi->hda2codec_clk);
-	clk_enable(hdmi->hda2hdmicodec_clk);
-#endif
-
 	/* back off multiplier before attaching to parent at new rate. */
 	oldrate = clk_get_rate(hdmi->clk);
 	clk_set_rate(hdmi->clk, oldrate / 2);
@@ -1673,11 +1627,6 @@ static void tegra_dc_hdmi_disable(struct tegra_dc *dc)
 
 #if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
 	tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_SOR_AUDIO_HDA_PRESENSE_0);
-	/* sleep 1ms before disabling clocks to ensure HDA gets the interrupt */
-	msleep(1);
-	clk_disable(hdmi->hda2hdmicodec_clk);
-	clk_disable(hdmi->hda2codec_clk);
-	clk_disable(hdmi->hda_clk);
 #endif
 	tegra_periph_reset_assert(hdmi->clk);
 	hdmi->clk_enabled = false;