diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 10:44:11 (GMT) |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 10:44:11 (GMT) |
| commit | d6c2152b3efd73be265f426b5a1bb50ec436d999 (patch) | |
| tree | f35b2a9b40c82028a4a2ecd4593d592431db8fc2 /drivers/video/fbdev/omap2/dss/dsi.c | |
| parent | ee06bd155b081a1895f995ec2777094c7e746152 (diff) | |
| parent | 811fbb1f580ca024a0af603dfaef08a4d1dcb5ef (diff) | |
| download | linux-d6c2152b3efd73be265f426b5a1bb50ec436d999.tar.xz | |
Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next
Merge fbdev topic branches
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/dsi.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dsi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c index 3e44c58..5081f6f 100644 --- a/drivers/video/fbdev/omap2/dss/dsi.c +++ b/drivers/video/fbdev/omap2/dss/dsi.c @@ -5238,6 +5238,7 @@ static int dsi_init_pll_data(struct platform_device *dsidev) } pll->name = dsi->module_id == 0 ? "dsi0" : "dsi1"; + pll->id = dsi->module_id == 0 ? DSS_PLL_DSI1 : DSS_PLL_DSI2; pll->clkin = clk; pll->base = dsi->pll_base; |