drm: omapdrm: hdmi: Configure the PLL from the HDMI core version

The OMAP4 and OMAP5 PLLs have different properties that require specific
handling in the HDMI PLL driver. This needs knowledge of the PLL
version, which is currently inferred from the DSS version. AS part of
the effort to remove usage of the DSS version, use the HDMI controller
version instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index 0988f2d7a31f38851d20f6ecb3d10e0474e305cb..55bee81f4dd52a25ef4d9df81087411fa024e7f8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -146,21 +146,10 @@ static int hdmi_init_pll_data(struct platform_device *pdev,
        pll->base = hpll->base;
        pll->clkin = clk;
 
-       switch (omapdss_get_version()) {
-       case OMAPDSS_VER_OMAP4430_ES1:
-       case OMAPDSS_VER_OMAP4430_ES2:
-       case OMAPDSS_VER_OMAP4:
+       if (hpll->wp->version == 4)
                pll->hw = &dss_omap4_hdmi_pll_hw;
-               break;
-
-       case OMAPDSS_VER_OMAP5:
-       case OMAPDSS_VER_DRA7xx:
+       else
                pll->hw = &dss_omap5_hdmi_pll_hw;
-               break;
-
-       default:
-               return -ENODEV;
-       }
 
        pll->ops = &hdmi_pll_ops;