diff options
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 2 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 1 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss_features.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 0c3afc2b4696..a16c8b229ea7 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -1690,6 +1690,8 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev, | |||
1690 | l = FLD_MOD(l, 1, 13, 13); /* DSI_PLL_REFEN */ | 1690 | l = FLD_MOD(l, 1, 13, 13); /* DSI_PLL_REFEN */ |
1691 | l = FLD_MOD(l, 0, 14, 14); /* DSIPHY_CLKINEN */ | 1691 | l = FLD_MOD(l, 0, 14, 14); /* DSIPHY_CLKINEN */ |
1692 | l = FLD_MOD(l, 1, 20, 20); /* DSI_HSDIVBYPASS */ | 1692 | l = FLD_MOD(l, 1, 20, 20); /* DSI_HSDIVBYPASS */ |
1693 | if (dss_has_feature(FEAT_DSI_PLL_REFSEL)) | ||
1694 | l = FLD_MOD(l, 3, 22, 21); /* REF_SYSCLK = sysclk */ | ||
1693 | dsi_write_reg(dsidev, DSI_PLL_CONFIGURATION2, l); | 1695 | dsi_write_reg(dsidev, DSI_PLL_CONFIGURATION2, l); |
1694 | 1696 | ||
1695 | REG_FLD_MOD(dsidev, DSI_PLL_GO, 1, 0, 0); /* DSI_PLL_GO */ | 1697 | REG_FLD_MOD(dsidev, DSI_PLL_GO, 1, 0, 0); /* DSI_PLL_GO */ |
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 177f6e8d2d7c..46855316d215 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c | |||
@@ -520,6 +520,7 @@ static const enum dss_feat_id omap5_dss_feat_list[] = { | |||
520 | FEAT_FIFO_MERGE, | 520 | FEAT_FIFO_MERGE, |
521 | FEAT_BURST_2D, | 521 | FEAT_BURST_2D, |
522 | FEAT_DSI_PLL_SELFREQDCO, | 522 | FEAT_DSI_PLL_SELFREQDCO, |
523 | FEAT_DSI_PLL_REFSEL, | ||
523 | }; | 524 | }; |
524 | 525 | ||
525 | /* OMAP2 DSS Features */ | 526 | /* OMAP2 DSS Features */ |
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h index f9b9d28ed312..0020bf66f3f5 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/drivers/video/omap2/dss/dss_features.h | |||
@@ -66,6 +66,7 @@ enum dss_feat_id { | |||
66 | FEAT_OMAP3_DSI_FIFO_BUG, | 66 | FEAT_OMAP3_DSI_FIFO_BUG, |
67 | FEAT_BURST_2D, | 67 | FEAT_BURST_2D, |
68 | FEAT_DSI_PLL_SELFREQDCO, | 68 | FEAT_DSI_PLL_SELFREQDCO, |
69 | FEAT_DSI_PLL_REFSEL, | ||
69 | }; | 70 | }; |
70 | 71 | ||
71 | /* DSS register field id */ | 72 | /* DSS register field id */ |