diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-09 18:49:56 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-09 18:49:56 -0500 |
| commit | fa3c5afc525bacfcdd2ba5107da5a2d93a04b32b (patch) | |
| tree | 9436c31da1eef306de395e7690d7a94e8cb4247f /drivers/video/omap2/dss/dss_features.c | |
| parent | 054fcd5d3ae013db9efc4e5781bc09a68ff89fdb (diff) | |
| parent | 90c708390a96e87a8255218f86bc18fb616a05b1 (diff) | |
Merge branch 'display-patches-for-linaro-37' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb into linaro-2.6.37linaro-linux-2.6.37-upstream-10Feb2011
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.c')
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index cf3ef696e14..39864f6bb46 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c @@ -157,7 +157,8 @@ static struct omap_dss_features omap3430_dss_features = { .has_feature = FEAT_GLOBAL_ALPHA | FEAT_LCDENABLEPOL | FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE | - FEAT_FUNCGATED, + FEAT_FUNCGATED | FEAT_COMMON_IRQ_DISPC_DSI | + FEAT_VAR_DPLL_FCK, .num_mgrs = 2, .num_ovls = 3, @@ -172,7 +173,9 @@ static struct omap_dss_features omap3630_dss_features = { .has_feature = FEAT_GLOBAL_ALPHA | FEAT_LCDENABLEPOL | FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE | - FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED, + FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED | + FEAT_COMMON_IRQ_DISPC_DSI | FEAT_VAR_DPLL_FCK | + FEAT_DPLL_FCK_32_DIV, .num_mgrs = 2, .num_ovls = 3, @@ -187,7 +190,8 @@ static struct omap_dss_features omap4_dss_features = { .has_feature = FEAT_GLOBAL_ALPHA | FEAT_PRE_MULT_ALPHA | - FEAT_MGR_LCD2, + FEAT_MGR_LCD2 | FEAT_VAR_DPLL_FCK | + FEAT_DPLL_FCK_32_DIV | FEAT_CORE_CLK_DIV, .num_mgrs = 3, .num_ovls = 3, |