diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-12-31 04:25:48 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 05:32:06 -0500 |
commit | 935509275c2d315c6551da4d73bb3c36871b137c (patch) | |
tree | 3b264c23c393f0abb1011b3f279632332d3f1c66 /drivers/video | |
parent | 99767548b128dae8eb46b7039958b2b6a5483c66 (diff) |
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/omap2/dss/dispc.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index 9850d9ef9a9d..48429bab294a 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.c +++ b/drivers/video/fbdev/omap2/dss/dispc.c | |||
@@ -3037,10 +3037,16 @@ unsigned long dispc_fclk_rate(void) | |||
3037 | break; | 3037 | break; |
3038 | case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC: | 3038 | case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC: |
3039 | pll = dss_pll_find("dsi0"); | 3039 | pll = dss_pll_find("dsi0"); |
3040 | if (!pll) | ||
3041 | pll = dss_pll_find("video0"); | ||
3042 | |||
3040 | r = pll->cinfo.clkout[0]; | 3043 | r = pll->cinfo.clkout[0]; |
3041 | break; | 3044 | break; |
3042 | case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC: | 3045 | case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC: |
3043 | pll = dss_pll_find("dsi1"); | 3046 | pll = dss_pll_find("dsi1"); |
3047 | if (!pll) | ||
3048 | pll = dss_pll_find("video1"); | ||
3049 | |||
3044 | r = pll->cinfo.clkout[0]; | 3050 | r = pll->cinfo.clkout[0]; |
3045 | break; | 3051 | break; |
3046 | default: | 3052 | default: |
@@ -3069,10 +3075,16 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel) | |||
3069 | break; | 3075 | break; |
3070 | case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC: | 3076 | case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC: |
3071 | pll = dss_pll_find("dsi0"); | 3077 | pll = dss_pll_find("dsi0"); |
3078 | if (!pll) | ||
3079 | pll = dss_pll_find("video0"); | ||
3080 | |||
3072 | r = pll->cinfo.clkout[0]; | 3081 | r = pll->cinfo.clkout[0]; |
3073 | break; | 3082 | break; |
3074 | case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC: | 3083 | case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC: |
3075 | pll = dss_pll_find("dsi1"); | 3084 | pll = dss_pll_find("dsi1"); |
3085 | if (!pll) | ||
3086 | pll = dss_pll_find("video1"); | ||
3087 | |||
3076 | r = pll->cinfo.clkout[0]; | 3088 | r = pll->cinfo.clkout[0]; |
3077 | break; | 3089 | break; |
3078 | default: | 3090 | default: |
@@ -3668,6 +3680,7 @@ static int __init dispc_init_features(struct platform_device *pdev) | |||
3668 | break; | 3680 | break; |
3669 | 3681 | ||
3670 | case OMAPDSS_VER_OMAP5: | 3682 | case OMAPDSS_VER_OMAP5: |
3683 | case OMAPDSS_VER_DRA7xx: | ||
3671 | src = &omap54xx_dispc_feats; | 3684 | src = &omap54xx_dispc_feats; |
3672 | break; | 3685 | break; |
3673 | 3686 | ||
@@ -3832,6 +3845,7 @@ static const struct of_device_id dispc_of_match[] = { | |||
3832 | { .compatible = "ti,omap3-dispc", }, | 3845 | { .compatible = "ti,omap3-dispc", }, |
3833 | { .compatible = "ti,omap4-dispc", }, | 3846 | { .compatible = "ti,omap4-dispc", }, |
3834 | { .compatible = "ti,omap5-dispc", }, | 3847 | { .compatible = "ti,omap5-dispc", }, |
3848 | { .compatible = "ti,dra7-dispc", }, | ||
3835 | {}, | 3849 | {}, |
3836 | }; | 3850 | }; |
3837 | 3851 | ||