OMAPDSS: HDMI: use common DSS PLL support

Now that we have the common DSS PLL support, change HDMI to use it. This
results in quite a lot of changes, but almost all of them are trivial
name changes.

The function to program the PLL settings can be removed from hdmi_pll.c,
as the common PLL API contains the same functionality.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

4 files changed, 146 insertions, 214 deletions

diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h
index 7595274a9bcf..3c42823e934b 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/dss/hdmi.h
@@ -184,18 +184,6 @@ struct hdmi_config {
         enum hdmi_core_hdmi_dvi hdmi_dvi_mode;
 };
 
-/* HDMI PLL structure */
-struct hdmi_pll_info {
-        u16 regn;
-        u16 regm;
-        u32 regmf;
-        u16 regm2;
-        u16 regsd;
-
-        unsigned long clkdco;
-        unsigned long clkout;
-};
-
 struct hdmi_audio_format {
         enum hdmi_stereo_channels               stereo_channels;
         u8                                      active_chnnls_msk;
@@ -246,11 +234,11 @@ struct hdmi_wp_data {
 };
 
 struct hdmi_pll_data {
+        struct dss_pll pll;
+
         void __iomem *base;
 
         struct hdmi_wp_data *wp;
-
-        struct hdmi_pll_info info;
 };
 
 struct hdmi_phy_data {
@@ -314,14 +302,12 @@ void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,
 int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp);
 
 /* HDMI PLL funcs */
-int hdmi_pll_enable(struct hdmi_pll_data *pll);
-void hdmi_pll_disable(struct hdmi_pll_data *pll);
-int hdmi_pll_set_config(struct hdmi_pll_data *pll);
 void hdmi_pll_dump(struct hdmi_pll_data *pll, struct seq_file *s);
-void hdmi_pll_compute(struct hdmi_pll_data *pll, unsigned long clkin,
-        unsigned long target_tmds);
+void hdmi_pll_compute(struct hdmi_pll_data *pll,
+        unsigned long target_tmds, struct dss_pll_clock_info *pi);
 int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,
         struct hdmi_wp_data *wp);
+void hdmi_pll_uninit(struct hdmi_pll_data *hpll);
 
 /* HDMI PHY funcs */
 int hdmi_phy_configure(struct hdmi_phy_data *phy, unsigned long hfbitclk,
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c
index 98aa910241b8..46dcc71ce058 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4.c
@@ -49,7 +49,6 @@ static struct {
 
         struct hdmi_config cfg;
 
-        struct clk *sys_clk;
         struct regulator *vdda_hdmi_dac_reg;
 
         bool core_enabled;
@@ -181,6 +180,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
         struct omap_video_timings *p;
         struct omap_overlay_manager *mgr = hdmi.output.manager;
         struct hdmi_wp_data *wp = &hdmi.wp;
+        struct dss_pll_clock_info hdmi_cinfo = { 0 };
 
         r = hdmi_power_on_core(dssdev);
         if (r)
@@ -194,22 +194,22 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 
         DSSDBG("hdmi_power_on x_res= %d y_res = %d\n", p->x_res, p->y_res);
 
-        hdmi_pll_compute(&hdmi.pll, clk_get_rate(hdmi.sys_clk), p->pixelclock);
+        hdmi_pll_compute(&hdmi.pll, p->pixelclock, &hdmi_cinfo);
 
-        r = hdmi_pll_enable(&hdmi.pll);
+        r = dss_pll_enable(&hdmi.pll.pll);
         if (r) {
                 DSSERR("Failed to enable PLL\n");
                 goto err_pll_enable;
         }
 
-        r = hdmi_pll_set_config(&hdmi.pll);
+        r = dss_pll_set_config(&hdmi.pll.pll, &hdmi_cinfo);
         if (r) {
                 DSSERR("Failed to configure PLL\n");
                 goto err_pll_cfg;
         }
 
-        r = hdmi_phy_configure(&hdmi.phy, hdmi.pll.info.clkdco,
-                hdmi.pll.info.clkout);
+        r = hdmi_phy_configure(&hdmi.phy, hdmi_cinfo.clkdco,
+                hdmi_cinfo.clkout[0]);
         if (r) {
                 DSSDBG("Failed to configure PHY\n");
                 goto err_phy_cfg;
@@ -247,7 +247,7 @@ err_phy_cfg:
         hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
 err_phy_pwr:
 err_pll_cfg:
-        hdmi_pll_disable(&hdmi.pll);
+        dss_pll_disable(&hdmi.pll.pll);
 err_pll_enable:
         hdmi_power_off_core(dssdev);
         return -EIO;
@@ -265,7 +265,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev)
 
         hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
 
-        hdmi_pll_disable(&hdmi.pll);
+        dss_pll_disable(&hdmi.pll.pll);
 
         hdmi_power_off_core(dssdev);
 }
@@ -407,21 +407,6 @@ static void hdmi_core_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&hdmi.lock);
 }
 
-static int hdmi_get_clocks(struct platform_device *pdev)
-{
-        struct clk *clk;
-
-        clk = devm_clk_get(&pdev->dev, "sys_clk");
-        if (IS_ERR(clk)) {
-                DSSERR("can't get sys_clk\n");
-                return PTR_ERR(clk);
-        }
-
-        hdmi.sys_clk = clk;
-
-        return 0;
-}
-
 static int hdmi_connect(struct omap_dss_device *dssdev,
                 struct omap_dss_device *dst)
 {
@@ -700,22 +685,17 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev)
 
         r = hdmi_phy_init(pdev, &hdmi.phy);
         if (r)
-                return r;
+                goto err;
 
         r = hdmi4_core_init(pdev, &hdmi.core);
         if (r)