Commit 93550927 authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: DISPC: Add DRA7xx support

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 99767548
...@@ -3037,10 +3037,16 @@ unsigned long dispc_fclk_rate(void) ...@@ -3037,10 +3037,16 @@ unsigned long dispc_fclk_rate(void)
break; break;
case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC: case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
pll = dss_pll_find("dsi0"); pll = dss_pll_find("dsi0");
if (!pll)
pll = dss_pll_find("video0");
r = pll->cinfo.clkout[0]; r = pll->cinfo.clkout[0];
break; break;
case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC: case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
pll = dss_pll_find("dsi1"); pll = dss_pll_find("dsi1");
if (!pll)
pll = dss_pll_find("video1");
r = pll->cinfo.clkout[0]; r = pll->cinfo.clkout[0];
break; break;
default: default:
...@@ -3069,10 +3075,16 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel) ...@@ -3069,10 +3075,16 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
break; break;
case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC: case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
pll = dss_pll_find("dsi0"); pll = dss_pll_find("dsi0");
if (!pll)
pll = dss_pll_find("video0");
r = pll->cinfo.clkout[0]; r = pll->cinfo.clkout[0];
break; break;
case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC: case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
pll = dss_pll_find("dsi1"); pll = dss_pll_find("dsi1");
if (!pll)
pll = dss_pll_find("video1");
r = pll->cinfo.clkout[0]; r = pll->cinfo.clkout[0];
break; break;
default: default:
...@@ -3668,6 +3680,7 @@ static int __init dispc_init_features(struct platform_device *pdev) ...@@ -3668,6 +3680,7 @@ static int __init dispc_init_features(struct platform_device *pdev)
break; break;
case OMAPDSS_VER_OMAP5: case OMAPDSS_VER_OMAP5:
case OMAPDSS_VER_DRA7xx:
src = &omap54xx_dispc_feats; src = &omap54xx_dispc_feats;
break; break;
...@@ -3832,6 +3845,7 @@ static const struct of_device_id dispc_of_match[] = { ...@@ -3832,6 +3845,7 @@ static const struct of_device_id dispc_of_match[] = {
{ .compatible = "ti,omap3-dispc", }, { .compatible = "ti,omap3-dispc", },
{ .compatible = "ti,omap4-dispc", }, { .compatible = "ti,omap4-dispc", },
{ .compatible = "ti,omap5-dispc", }, { .compatible = "ti,omap5-dispc", },
{ .compatible = "ti,dra7-dispc", },
{}, {},
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment