From: Tero Kristo <t-kristo@ti.com> To: linux-omap@vger.kernel.org, tony@atomide.com Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCHv4 2/6] ARM: OMAP4: hwmod_data: add opt clks for dss_hdmi and dss_venc Date: Wed, 31 May 2017 17:59:59 +0300 [thread overview] Message-ID: <1496242803-6101-3-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1496242803-6101-1-git-send-email-t-kristo@ti.com> 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: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 94f09c7..0855434 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -775,6 +775,7 @@ 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 @@ * 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 @@ }; /* 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 @@ }, }, .parent_hwmod = &omap44xx_dss_hwmod, + .opt_clks = dss_venc_opt_clks, + .opt_clks_cnt = ARRAY_SIZE(dss_venc_opt_clks), }; /* -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv4 2/6] ARM: OMAP4: hwmod_data: add opt clks for dss_hdmi and dss_venc Date: Wed, 31 May 2017 17:59:59 +0300 [thread overview] Message-ID: <1496242803-6101-3-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1496242803-6101-1-git-send-email-t-kristo@ti.com> 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: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 94f09c7..0855434 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -775,6 +775,7 @@ 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 @@ * 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 @@ }; /* 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 @@ }, }, .parent_hwmod = &omap44xx_dss_hwmod, + .opt_clks = dss_venc_opt_clks, + .opt_clks_cnt = ARRAY_SIZE(dss_venc_opt_clks), }; /* -- 1.9.1
next prev parent reply other threads:[~2017-05-31 14:59 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-31 14:59 [PATCHv4 0/6] ARM: OMAP2+: preparation for clk/clkctrl support Tero Kristo 2017-05-31 14:59 ` Tero Kristo 2017-05-31 14:59 ` [PATCHv4 1/6] ARM: OMAP2+: timer: add support for fetching fck handle from DT Tero Kristo 2017-05-31 14:59 ` Tero Kristo 2017-05-31 14:59 ` Tero Kristo [this message] 2017-05-31 14:59 ` [PATCHv4 2/6] ARM: OMAP4: hwmod_data: add opt clks for dss_hdmi and dss_venc Tero Kristo 2017-05-31 15:00 ` [PATCHv4 3/6] ARM: OMAP2+: PRCM: store also physical addresses for instances Tero Kristo 2017-05-31 15:00 ` Tero Kristo 2017-05-31 15:00 ` [PATCHv4 4/6] ARM: omap2+: clockdomain: add clkdm_xlate_address Tero Kristo 2017-05-31 15:00 ` Tero Kristo 2017-05-31 15:00 ` [PATCHv4 5/6] ARM: OMAP4: cminst: add support for clkdm_xlate_address Tero Kristo 2017-05-31 15:00 ` Tero Kristo 2017-05-31 15:00 ` [PATCHv4 6/6] ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available Tero Kristo 2017-05-31 15:00 ` Tero Kristo 2017-05-31 19:53 ` [PATCHv4 0/6] ARM: OMAP2+: preparation for clk/clkctrl support Tony Lindgren 2017-05-31 19:53 ` Tony Lindgren 2017-05-31 22:20 ` Tony Lindgren 2017-05-31 22:20 ` Tony Lindgren 2017-06-06 7:17 ` Tony Lindgren 2017-06-06 7:17 ` Tony Lindgren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1496242803-6101-3-git-send-email-t-kristo@ti.com \ --to=t-kristo@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.