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

Commit 24d8d498 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP4: hwmod_data: add opt clks for dss_hdmi and dss_venc 



These extra optional clocks are required as main clock for these modules
are going to be routed to the main module clock. Otherwise, the hdmi / tv
clocks are not going to be enabled during usage, leading to failure.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 138f7ca7

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+9 −1
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ static struct omap_hwmod_dma_info omap44xx_dss_hdmi_sdma_reqs[] = { 


static struct omap_hwmod_opt_clk dss_hdmi_opt_clks[] = {

	{ .role = "sys_clk", .clk = "dss_sys_clk" },

	{ .role = "hdmi_clk", .clk = "dss_48mhz_clk" },

};



static struct omap_hwmod omap44xx_dss_hdmi_hwmod = {
@@ -785,7 +786,7 @@ static struct omap_hwmod omap44xx_dss_hdmi_hwmod = { 
	 * HDMI audio requires to use no-idle mode. Hence,

	 * set idle mode by software.

	 */

	.flags		= HWMOD_SWSUP_SIDLE,

	.flags		= HWMOD_SWSUP_SIDLE | HWMOD_OPT_CLKS_NEEDED,

	.mpu_irqs	= omap44xx_dss_hdmi_irqs,

	.xlate_irq	= omap4_xlate_irq,

	.sdma_reqs	= omap44xx_dss_hdmi_sdma_reqs,
@@ -858,11 +859,16 @@ static struct omap_hwmod_class omap44xx_venc_hwmod_class = { 
};



/* dss_venc */

static struct omap_hwmod_opt_clk dss_venc_opt_clks[] = {

	{ .role = "tv_clk", .clk = "dss_tv_clk" },

};



static struct omap_hwmod omap44xx_dss_venc_hwmod = {

	.name		= "dss_venc",

	.class		= &omap44xx_venc_hwmod_class,

	.clkdm_name	= "l3_dss_clkdm",

	.main_clk	= "dss_tv_clk",

	.flags		= HWMOD_OPT_CLKS_NEEDED,

	.prcm = {

		.omap4 = {

			.clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
@@ -870,6 +876,8 @@ static struct omap_hwmod omap44xx_dss_venc_hwmod = { 
		},

	},

	.parent_hwmod	= &omap44xx_dss_hwmod,

	.opt_clks	= dss_venc_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(dss_venc_opt_clks),

};



/*