summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dss.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-04-08 13:17:01 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-24 15:50:07 +0200
commit233628328037c02cf3db6165cab5d3f43587c5f3 (patch)
treef46e2a4084f25324c7afbfa4f27a84d8e9650b47 /drivers/video/omap2/dss/dss.c
parentOMAPDSS: DSI: improve DSI clock calcs for DISPC (diff)
downloadlinux-233628328037c02cf3db6165cab5d3f43587c5f3.tar.xz
linux-233628328037c02cf3db6165cab5d3f43587c5f3.zip
OMAPDSS: Add basic omap5 features to dss and dispc
Add basic omap5 features for dss and dispc. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dss.c')
-rw-r--r--drivers/video/omap2/dss/dss.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 759dbee48342..4524c174ac50 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -123,6 +123,12 @@ static const struct dss_features omap44xx_dss_feats __initconst = {
.clk_name = "dpll_per_m5x2_ck",
};
+static const struct dss_features omap54xx_dss_feats __initconst = {
+ .fck_div_max = 64,
+ .dss_fck_multiplier = 1,
+ .clk_name = "dpll_per_h12x2_ck",
+};
+
static inline void dss_write_reg(const struct dss_reg idx, u32 val)
{
__raw_writel(val, dss.base + idx.idx);
@@ -740,6 +746,8 @@ static int __init dss_init_features(struct device *dev)
src = &omap3630_dss_feats;
else if (cpu_is_omap44xx())
src = &omap44xx_dss_feats;
+ else if (soc_is_omap54xx())
+ src = &omap54xx_dss_feats;
else
return -ENODEV;