]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
OMAPDSS: DISPC: Add DRA7xx support
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 31 Dec 2014 09:25:48 +0000 (11:25 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 4 Feb 2015 10:32:06 +0000 (12:32 +0200)
Add DRA7xx support to DISPC driver. The DISPC block is the same as on
OMAP5, except the PLL's used for clocking are "videoX", not "dsiX".

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/omap2/dss/dispc.c

index 9850d9ef9a9d6497be3a27f2402bb6eef49702be..48429bab294a0697d3293b7686e7a24f3e2de20b 100644 (file)
@@ -3037,10 +3037,16 @@ unsigned long dispc_fclk_rate(void)
                break;
        case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
                pll = dss_pll_find("dsi0");
+               if (!pll)
+                       pll = dss_pll_find("video0");
+
                r = pll->cinfo.clkout[0];
                break;
        case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
                pll = dss_pll_find("dsi1");
+               if (!pll)
+                       pll = dss_pll_find("video1");
+
                r = pll->cinfo.clkout[0];
                break;
        default:
@@ -3069,10 +3075,16 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
                        break;
                case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
                        pll = dss_pll_find("dsi0");
+                       if (!pll)
+                               pll = dss_pll_find("video0");
+
                        r = pll->cinfo.clkout[0];
                        break;
                case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
                        pll = dss_pll_find("dsi1");
+                       if (!pll)
+                               pll = dss_pll_find("video1");
+
                        r = pll->cinfo.clkout[0];
                        break;
                default:
@@ -3668,6 +3680,7 @@ static int __init dispc_init_features(struct platform_device *pdev)
                break;
 
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                src = &omap54xx_dispc_feats;
                break;
 
@@ -3832,6 +3845,7 @@ static const struct of_device_id dispc_of_match[] = {
        { .compatible = "ti,omap3-dispc", },
        { .compatible = "ti,omap4-dispc", },
        { .compatible = "ti,omap5-dispc", },
+       { .compatible = "ti,dra7-dispc", },
        {},
 };