OMAPDSS: HDMI: Add DRA7xx support

Add support for DRA7xx to the HDMI driver.

The HDMI block on DRA7xx is the same as on OMAP5, except we need to
enable and disable the HDMI PLL via the CONTROL module.

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

diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c
index 39aae3aa7136dfe3234dcd8cded383a193d2ee1b..3f0b34a7031adc85bea15eb87fde380645d5f498 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5.c
@@ -787,6 +787,7 @@ static const struct dev_pm_ops hdmi_pm_ops = {
 
 static const struct of_device_id hdmi_of_match[] = {
        { .compatible = "ti,omap5-hdmi", },
+       { .compatible = "ti,dra7-hdmi", },
        {},
 };
 

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
index bc9e07d2afbe5132b56634b7a6b4a4c68ae74c84..1f5d19c119cea01dbf17801f9f149cf0e38afc06 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
@@ -208,6 +208,7 @@ static int hdmi_phy_init_features(struct platform_device *pdev)
                break;
 
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                src = &omap54xx_phy_feats;
                break;
 

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
index b808f7c72d83baee8d320245370881ae685d7834..06e23a7c432ccea22b02cfb32e47d2516ee757e2 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
@@ -104,6 +104,8 @@ static int hdmi_pll_enable(struct dss_pll *dsspll)
        struct hdmi_wp_data *wp = pll->wp;
        u16 r = 0;
 
+       dss_ctrl_pll_enable(DSS_PLL_HDMI, true);
+
        r = hdmi_wp_set_pll_pwr(wp, HDMI_PLLPWRCMD_BOTHON_ALLCLKS);
        if (r)
                return r;
@@ -117,6 +119,8 @@ static void hdmi_pll_disable(struct dss_pll *dsspll)
        struct hdmi_wp_data *wp = pll->wp;
 
        hdmi_wp_set_pll_pwr(wp, HDMI_PLLPWRCMD_ALLOFF);
+
+       dss_ctrl_pll_enable(DSS_PLL_HDMI, false);
 }
 
 static const struct dss_pll_ops dsi_pll_ops = {
@@ -197,6 +201,7 @@ static int dsi_init_pll_data(struct platform_device *pdev, struct hdmi_pll_data
                break;
 
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                pll->hw = &dss_omap5_hdmi_pll_hw;
                break;