[PATCH 10/24] drm/omap: Add missing clock sources

Tomi Valkeinen tomi.valkeinen at ti.com
Wed May 18 15:01:12 UTC 2016


enum dss_clk_source does not have values for all clock sources available
on OMAP4+ DSS versions. Add the missing clock sources.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>
---
 drivers/gpu/drm/omapdrm/dss/dss.c | 3 +++
 drivers/gpu/drm/omapdrm/dss/dss.h | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 58d20530059a..598a51b44e4a 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -108,8 +108,11 @@ static const char * const dss_generic_clk_source_names[] = {
 	[DSS_CLK_SRC_FCK]	= "FCK",
 	[DSS_CLK_SRC_PLL1_1]	= "PLL1:1",
 	[DSS_CLK_SRC_PLL1_2]	= "PLL1:2",
+	[DSS_CLK_SRC_PLL1_3]	= "PLL1:3",
 	[DSS_CLK_SRC_PLL2_1]	= "PLL2:1",
 	[DSS_CLK_SRC_PLL2_2]	= "PLL2:2",
+	[DSS_CLK_SRC_PLL2_3]	= "PLL2:3",
+	[DSS_CLK_SRC_HDMI_PLL]	= "HDMI PLL",
 };
 
 static bool dss_initialized;
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index 56c2d277341a..38e77fac2078 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -107,9 +107,13 @@ enum dss_clk_source {
 
 	DSS_CLK_SRC_PLL1_1,
 	DSS_CLK_SRC_PLL1_2,
+	DSS_CLK_SRC_PLL1_3,
 
 	DSS_CLK_SRC_PLL2_1,
 	DSS_CLK_SRC_PLL2_2,
+	DSS_CLK_SRC_PLL2_3,
+
+	DSS_CLK_SRC_HDMI_PLL,
 };
 
 enum dss_pll_id {
-- 
2.5.0



More information about the dri-devel mailing list