Skip to contentSkip to conversation

ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4

PATCH New Cousson, Benoit 2 participants 3 messages Jun 18, 2012 – Jul 2, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP hwmod data
lore
Share & tools
lore

Cousson, Benoit

author
#0 lore raw

PATCH 1/1 ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4

The commit 503d0ea24d1d3dd3db95e5e0edd693da7a2a23eb
ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks

added a wrong "prcm_clk" alias for PRCM clock whereas the McBSP driver and previous OMAPs are using "prcm_fck".

It thus lead to the following warning.

[   47.409729] omap-mcbsp: clks: could not clk_get() prcm_fck

Fix that by changing the opt_clk role to prcm_fck.

Reported-by Misael Lopez Cruz <[email protected]>
Signed-off-by Benoit Cousson <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Tested-by Sebastien Guiriec <[email protected]>
---
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +4 -4
index 950454a..1527541 100644
@@ -1924,7 +1924,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp1_sdma_reqs[] = {
 
 static struct omap_hwmod_opt_clk mcbsp1_opt_clks[] = {
 	{ .role = "pad_fck", .clk = "pad_clks_ck" },
-	{ .role = "prcm_clk", .clk = "mcbsp1_sync_mux_ck" },
+	{ .role = "prcm_fck", .clk = "mcbsp1_sync_mux_ck" },
 };
 
 static struct omap_hwmod omap44xx_mcbsp1_hwmod = {

@@ -1959,7 +1959,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp2_sdma_reqs[] = {
 
 static struct omap_hwmod_opt_clk mcbsp2_opt_clks[] = {
 	{ .role = "pad_fck", .clk = "pad_clks_ck" },
-	{ .role = "prcm_clk", .clk = "mcbsp2_sync_mux_ck" },
+	{ .role = "prcm_fck", .clk = "mcbsp2_sync_mux_ck" },
 };
 
 static struct omap_hwmod omap44xx_mcbsp2_hwmod = {

@@ -1994,7 +1994,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp3_sdma_reqs[] = {
 
 static struct omap_hwmod_opt_clk mcbsp3_opt_clks[] = {
 	{ .role = "pad_fck", .clk = "pad_clks_ck" },
-	{ .role = "prcm_clk", .clk = "mcbsp3_sync_mux_ck" },
+	{ .role = "prcm_fck", .clk = "mcbsp3_sync_mux_ck" },
 };
 
 static struct omap_hwmod omap44xx_mcbsp3_hwmod = {

@@ -2029,7 +2029,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp4_sdma_reqs[] = {
 
 static struct omap_hwmod_opt_clk mcbsp4_opt_clks[] = {
 	{ .role = "pad_fck", .clk = "pad_clks_ck" },
-	{ .role = "prcm_clk", .clk = "mcbsp4_sync_mux_ck" },
+	{ .role = "prcm_fck", .clk = "mcbsp4_sync_mux_ck" },
 };
 
 static struct omap_hwmod omap44xx_mcbsp4_hwmod = {
Signature · 1 line
1.7.0.4
maintainer
#1 lore raw

PATCH 1/1 ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4

Quoted 8 lines · Benoit

The commit 503d0ea24d1d3dd3db95e5e0edd693da7a2a23eb
ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks

added a wrong "prcm_clk" alias for PRCM clock whereas the McBSP driver and previous OMAPs are using "prcm_fck".

It thus lead to the following warning.

Quoted 8 lines
[   47.409729] omap-mcbsp: clks: could not clk_get() prcm_fck

Fix that by changing the opt_clk role to prcm_fck.

Reported-by Misael Lopez Cruz <[email protected]>
Signed-off-by Benoit Cousson <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Tested-by Sebastien Guiriec <[email protected]>

Thanks, will queue this as part of the next 3.5-rc series.

- Paul

author
#2 lore raw

PATCH 1/1 ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4

Hi Paul,

Quoted 12 lines · Paul Walmsley
Quoted 10 lines · Benoit

The commit 503d0ea24d1d3dd3db95e5e0edd693da7a2a23eb
ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks

added a wrong "prcm_clk" alias for PRCM clock whereas the McBSP driver and previous OMAPs are using "prcm_fck".

It thus lead to the following warning.

[   47.409729] omap-mcbsp: clks: could not clk_get() prcm_fck
Quoted 8 lines
Quoted 6 lines

Fix that by changing the opt_clk role to prcm_fck.

Reported-by Misael Lopez Cruz <[email protected]>
Signed-off-by Benoit Cousson <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Tested-by Sebastien Guiriec <[email protected]>

Thanks, will queue this as part of the next 3.5-rc series.

I might be wrong but it seems that this one is not yet in 3.5-rc5.

Thanks,
Benoit