Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06ede3dd authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: add field for PLL type 



DSS uses two types of PLLs, type A (DSI & Video) and type B (HDMI). The
two types behave slightly differently, but we don't have the type of the
PLL available anywhere for the driver.

This patch adds an enum for the PLL type and a field in the PLL's HW
data to store it.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent b5d8c757

drivers/gpu/drm/omapdrm/dss/dsi.c

+6 −0
Original line number Diff line number Diff line
@@ -5147,6 +5147,8 @@ static const struct dss_pll_ops dsi_pll_ops = { 
};



static const struct dss_pll_hw dss_omap3_dsi_pll_hw = {

	.type = DSS_PLL_TYPE_A,



	.n_max = (1 << 7) - 1,

	.m_max = (1 << 11) - 1,

	.mX_max = (1 << 4) - 1,
@@ -5172,6 +5174,8 @@ static const struct dss_pll_hw dss_omap3_dsi_pll_hw = { 
};



static const struct dss_pll_hw dss_omap4_dsi_pll_hw = {

	.type = DSS_PLL_TYPE_A,



	.n_max = (1 << 8) - 1,

	.m_max = (1 << 12) - 1,

	.mX_max = (1 << 5) - 1,
@@ -5197,6 +5201,8 @@ static const struct dss_pll_hw dss_omap4_dsi_pll_hw = { 
};



static const struct dss_pll_hw dss_omap5_dsi_pll_hw = {

	.type = DSS_PLL_TYPE_A,



	.n_max = (1 << 8) - 1,

	.m_max = (1 << 12) - 1,

	.mX_max = (1 << 5) - 1,

drivers/gpu/drm/omapdrm/dss/dss.h

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,11 @@ struct dss_pll; 


#define DSS_PLL_MAX_HSDIVS 4



enum dss_pll_type {

	DSS_PLL_TYPE_A,

	DSS_PLL_TYPE_B,

};



/*

 * Type-A PLLs: clkout[]/mX[] refer to hsdiv outputs m4, m5, m6, m7.

 * Type-B PLLs: clkout[0] refers to m2.
@@ -154,6 +159,8 @@ struct dss_pll_ops { 
};



struct dss_pll_hw {

	enum dss_pll_type type;



	unsigned n_max;

	unsigned m_min;

	unsigned m_max;

drivers/gpu/drm/omapdrm/dss/hdmi_pll.c

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ static const struct dss_pll_ops dsi_pll_ops = { 
};



static const struct dss_pll_hw dss_omap4_hdmi_pll_hw = {

	.type = DSS_PLL_TYPE_B,



	.n_max = 255,

	.m_min = 20,

	.m_max = 4095,
@@ -153,6 +155,8 @@ static const struct dss_pll_hw dss_omap4_hdmi_pll_hw = { 
};



static const struct dss_pll_hw dss_omap5_hdmi_pll_hw = {

	.type = DSS_PLL_TYPE_B,



	.n_max = 255,

	.m_min = 20,

	.m_max = 2045,

drivers/gpu/drm/omapdrm/dss/video-pll.c

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ static const struct dss_pll_ops dss_pll_ops = { 
};



static const struct dss_pll_hw dss_dra7_video_pll_hw = {

	.type = DSS_PLL_TYPE_A,



	.n_max = (1 << 8) - 1,

	.m_max = (1 << 12) - 1,

	.mX_max = (1 << 5) - 1,