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>

diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c
index 3e44c580b1f8e8a061ff8656c5877a53e718ec5d..5081f6fb1737ee02ab29cdbfd32fd150e6844300 100644 (file)
--- 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;
 

diff --git a/drivers/video/fbdev/omap2/dss/dss.h b/drivers/video/fbdev/omap2/dss/dss.h
index 14fb0c23f4a258e6869c4999f17e8afeb14cd348..1826ee96265be13d2187fdc7d742802126ee6be7 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dss.h
+++ b/drivers/video/fbdev/omap2/dss/dss.h
@@ -100,6 +100,12 @@ enum dss_writeback_channel {
        DSS_WB_LCD3_MGR =       7,
 };
 
+enum dss_pll_id {
+       DSS_PLL_DSI1,
+       DSS_PLL_DSI2,
+       DSS_PLL_HDMI,
+};
+
 struct dss_pll;
 
 #define DSS_PLL_MAX_HSDIVS 4
@@ -150,6 +156,7 @@ struct dss_pll_hw {
 
 struct dss_pll {
        const char *name;
+       enum dss_pll_id id;
 
        struct clk *clkin;
        struct regulator *regulator;

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
index ac83ef5cfd7d7f6a96848d546e3c7155dfdcd148..b808f7c72d83baee8d320245370881ae685d7834 100644 (file)
--- 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
        }
 
        pll->name = "hdmi";
+       pll->id = DSS_PLL_HDMI;
        pll->base = hpll->base;
        pll->clkin = clk;