aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-01-02 03:05:33 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-02-04 05:32:02 -0500
commit64e22ffdabeb9391f576bedbed03c480a1ecd593 (patch)
tree6388be7b237ed111c28e613b7731a28b5c3eabc1 /drivers/video
parent493a584a8bf6a3253f6d6a9034d6d3673a47c08c (diff)
OMAPDSS: Add enum dss_pll_id
In some cases we need global identifiers for the DSS PLLs, for example when configuring clock muxing on DRA7. For this purpose let's add a 'enum dss_pll_id'. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/dss/dsi.c1
-rw-r--r--drivers/video/fbdev/omap2/dss/dss.h7
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_pll.c1
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c
index 3e44c580b1f8..5081f6fb1737 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)
5238 } 5238 }
5239 5239
5240 pll->name = dsi->module_id == 0 ? "dsi0" : "dsi1"; 5240 pll->name = dsi->module_id == 0 ? "dsi0" : "dsi1";
5241 pll->id = dsi->module_id == 0 ? DSS_PLL_DSI1 : DSS_PLL_DSI2;
5241 pll->clkin = clk; 5242 pll->clkin = clk;
5242 pll->base = dsi->pll_base; 5243 pll->base = dsi->pll_base;
5243 5244
diff --git a/drivers/video/fbdev/omap2/dss/dss.h b/drivers/video/fbdev/omap2/dss/dss.h
index 14fb0c23f4a2..1826ee96265b 100644
--- a/drivers/video/fbdev/omap2/dss/dss.h
+++ b/drivers/video/fbdev/omap2/dss/dss.h
@@ -100,6 +100,12 @@ enum dss_writeback_channel {
100 DSS_WB_LCD3_MGR = 7, 100 DSS_WB_LCD3_MGR = 7,
101}; 101};
102 102
103enum dss_pll_id {
104 DSS_PLL_DSI1,
105 DSS_PLL_DSI2,
106 DSS_PLL_HDMI,
107};
108
103struct dss_pll; 109struct dss_pll;
104 110
105#define DSS_PLL_MAX_HSDIVS 4 111#define DSS_PLL_MAX_HSDIVS 4
@@ -150,6 +156,7 @@ struct dss_pll_hw {
150 156
151struct dss_pll { 157struct dss_pll {
152 const char *name; 158 const char *name;
159 enum dss_pll_id id;
153 160
154 struct clk *clkin; 161 struct clk *clkin;
155 struct regulator *regulator; 162 struct regulator *regulator;
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
index ac83ef5cfd7d..b808f7c72d83 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
@@ -185,6 +185,7 @@ static int dsi_init_pll_data(struct platform_device *pdev, struct hdmi_pll_data
185 } 185 }
186 186
187 pll->name = "hdmi"; 187 pll->name = "hdmi";
188 pll->id = DSS_PLL_HDMI;
188 pll->base = hpll->base; 189 pll->base = hpll->base;
189 pll->clkin = clk; 190 pll->clkin = clk;
190 191