Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1390994

[PATCH v3 1/7] ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data

Show all headers | View raw

The McBSPLP's sidetone main clock is the McBSPLP's ICLK, not FCLK as the
sidetone only receives the ICLK from the main McBSP module.
Since the McBSP and sidetone is using the very same clock from PRCM level
the sidetone must not have the prcm section to check the clock status since
the sidetone is only used when McBSP is already configured.
If two separate hwmods looking at the same bit and they would use
pm_runtime in nested way (as it must happen with McBSP and it's ST module)
the hwmod would warn, because the idlest will not match what it is expected
after enable/disable of the clocks.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 9869a75c5d96..d72ee6185d5e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1322,16 +1322,8 @@ static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod = {
 	.name		= "mcbsp2_sidetone",
 	.class		= &omap3xxx_mcbsp_sidetone_hwmod_class,
 	.mpu_irqs	= omap3xxx_mcbsp2_sidetone_irqs,
-	.main_clk	= "mcbsp2_fck",
-	.prcm		= {
-		.omap2 = {
-			.prcm_reg_id = 1,
-			 .module_bit = OMAP3430_EN_MCBSP2_SHIFT,
-			.module_offs = OMAP3430_PER_MOD,
-			.idlest_reg_id = 1,
-			.idlest_idle_bit = OMAP3430_ST_MCBSP2_SHIFT,
-		},
-	},
+	.main_clk	= "mcbsp2_ick",
+	.flags		= HWMOD_NO_IDLEST,
 };
 
 /* mcbsp3_sidetone */
@@ -1344,16 +1336,8 @@ static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod = {
 	.name		= "mcbsp3_sidetone",
 	.class		= &omap3xxx_mcbsp_sidetone_hwmod_class,
 	.mpu_irqs	= omap3xxx_mcbsp3_sidetone_irqs,
-	.main_clk	= "mcbsp3_fck",
-	.prcm		= {
-		.omap2 = {
-			.prcm_reg_id = 1,
-			.module_bit = OMAP3430_EN_MCBSP3_SHIFT,
-			.module_offs = OMAP3430_PER_MOD,
-			.idlest_reg_id = 1,
-			.idlest_idle_bit = OMAP3430_ST_MCBSP3_SHIFT,
-		},
-	},
+	.main_clk	= "mcbsp3_ick",
+	.flags		= HWMOD_NO_IDLEST,
 };
 
 /* SR common */
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/7] ARM/ASoC: OMAP3: Fix McBSP2/3 sidetone support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 13:00 +0200
  [PATCH v3 1/7] ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 13:00 +0200
    Re: [PATCH v3 1/7] ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data Tony Lindgren <tony@atomide.com> - 2016-04-29 17:40 +0200
  [PATCH v3 7/7] ARM: OMAP2+: McBSP: Remove the old iclk allow/deny idle code Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 13:00 +0200
  [PATCH v3 3/7] ARM: OMAP3: McBSP: New callback for McBSP2/3 ICLK idle configuration Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 13:00 +0200
  [PATCH v3 6/7] ASoC: omap-mcbsp: sidetone: Use the new callback for iclk handling Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 13:00 +0200
    Re: [PATCH v3 6/7] ASoC: omap-mcbsp: sidetone: Use the new callback  for iclk handling Mark Brown <broonie@kernel.org> - 2016-05-02 12:50 +0200
  [PATCH v3 2/7] ARM: dts: omap3: Add clocks to McBSP nodes Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 14:20 +0200
  [PATCH v3 5/7] ASoc: omap-mcbsp: Rename omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup() Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 14:20 +0200
    Re: [PATCH v3 5/7] ASoc: omap-mcbsp: Rename  omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup() Mark Brown <broonie@kernel.org> - 2016-05-02 12:50 +0200
  [PATCH v3 4/7] ARM: OMAP3: pdata-quirks: Add support for McBSP2/3 sidetone handling Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-04-29 14:20 +0200
  Re: [PATCH v3 0/7] ARM/ASoC: OMAP3: Fix McBSP2/3 sidetone support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-05-11 10:50 +0200

csiph-web