[PATCH v2 0/2] ARM: OMAP4: Audio regression fix for 3.8 kernel

[PATCH v2 0/2] ARM: OMAP4: Audio regression fix for 3.8 kernel

[Peter Ujfalusi]

Hello,

Changes since v1:
- Update the comment in cclock44xx_data.c as suggested by Jon Hunter

I have noticed that in 3.8-rc2 kernel OMAP4 audio is not working correctly. The
audio playback is in 'slow motion' mode.
The following two patch fixes this regression.

We need to lock the ABE DPLL for all OMAP4 revisions not only for 446x and McPDM
need to be configured to no IDLE mode during activity.

Regards,
Peter
---
Peter Ujfalusi (2):
  ARM: OMAP4: clock data: Lock ABE DPLL on all revisions
  ARM: OMAP4: hwmod_data: Correct IDLEMODE for McPDM

 arch/arm/mach-omap2/cclock44xx_data.c      | 13 ++++++-------
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

-- 
1.8.0.2

[PATCH v2 1/2] ARM: OMAP4: clock data: Lock ABE DPLL on all revisions

[Peter Ujfalusi]

To avoid issues with audio caused by non locked ABE DPLL we should
make sure it is locked in all OMAP4 revisions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

asda d
---
 arch/arm/mach-omap2/cclock44xx_data.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c
index 5789a5e..a2cc046 100644
--- a/arch/arm/mach-omap2/cclock44xx_data.c
+++ b/arch/arm/mach-omap2/cclock44xx_data.c
@@ -2026,14 +2026,13 @@ int __init omap4xxx_clk_init(void)
 	 * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power
 	 * state when turning the ABE clock domain. Workaround this by
 	 * locking the ABE DPLL on boot.
+	 * Lock the ABE DPLL in any case to avoid issues with audio.
 	 */
-	if (cpu_is_omap446x()) {
-		rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck);
-		if (!rc)
-			rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ);
-		if (rc)
-			pr_err("%s: failed to configure ABE DPLL!\n", __func__);
-	}
+	rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck);
+	if (!rc)
+		rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ);
+	if (rc)
+		pr_err("%s: failed to configure ABE DPLL!\n", __func__);
 
 	return 0;
 }
-- 
1.8.0.2

[PATCH v2 2/2] ARM: OMAP4: hwmod_data: Correct IDLEMODE for McPDM

[Peter Ujfalusi]

McPDM need to be configured to NO_IDLE mode when it is in used otherwise
vital clocks will be gated which results 'slow motion' audio playback.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 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 129d508..584acf9 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2133,7 +2133,7 @@ static struct omap_hwmod omap44xx_mcpdm_hwmod = {
 	 * available, so it doesn't seem that we have any choice in
 	 * the kernel other than to avoid resetting it.
 	 */
-	.flags		= HWMOD_EXT_OPT_MAIN_CLK,
+	.flags		= HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE,
 	.mpu_irqs	= omap44xx_mcpdm_irqs,
 	.sdma_reqs	= omap44xx_mcpdm_sdma_reqs,
 	.main_clk	= "mcpdm_fck",
-- 
1.8.0.2

[PATCH v2 1/2] ARM: OMAP4: clock data: Lock ABE DPLL on all revisions

[Jon Hunter]

On 01/04/2013 04:09 AM, Peter Ujfalusi wrote:
> To avoid issues with audio caused by non locked ABE DPLL we should
> make sure it is locked in all OMAP4 revisions.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> asda d

Not sure what the above is ;-)

> ---
>  arch/arm/mach-omap2/cclock44xx_data.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c
> index 5789a5e..a2cc046 100644
> --- a/arch/arm/mach-omap2/cclock44xx_data.c
> +++ b/arch/arm/mach-omap2/cclock44xx_data.c
> @@ -2026,14 +2026,13 @@ int __init omap4xxx_clk_init(void)
>  	 * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power
>  	 * state when turning the ABE clock domain. Workaround this by
>  	 * locking the ABE DPLL on boot.
> +	 * Lock the ABE DPLL in any case to avoid issues with audio.
>  	 */
> -	if (cpu_is_omap446x()) {
> -		rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck);
> -		if (!rc)
> -			rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ);
> -		if (rc)
> -			pr_err("%s: failed to configure ABE DPLL!\n", __func__);
> -	}
> +	rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck);
> +	if (!rc)
> +		rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ);
> +	if (rc)
> +		pr_err("%s: failed to configure ABE DPLL!\n", __func__);
>  
>  	return 0;
>  }

Acked-by: Jon Hunter <jon-hunter@ti.com>

Cheers
Jon

[PATCH v2 1/2] ARM: OMAP4: clock data: Lock ABE DPLL on all revisions

[Peter Ujfalusi]

On 01/04/2013 04:10 PM, Jon Hunter wrote:
> 
> On 01/04/2013 04:09 AM, Peter Ujfalusi wrote:
>> To avoid issues with audio caused by non locked ABE DPLL we should
>> make sure it is locked in all OMAP4 revisions.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>>
>> asda d
> 
> Not sure what the above is ;-)

Argh, squashed patches without commit message cleanup...
Paul: can you fix this up, or should I resend?

> 
>> ---
>>  arch/arm/mach-omap2/cclock44xx_data.c | 13 ++++++-------
>>  1 file changed, 6 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c
>> index 5789a5e..a2cc046 100644
>> --- a/arch/arm/mach-omap2/cclock44xx_data.c
>> +++ b/arch/arm/mach-omap2/cclock44xx_data.c
>> @@ -2026,14 +2026,13 @@ int __init omap4xxx_clk_init(void)
>>  	 * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power
>>  	 * state when turning the ABE clock domain. Workaround this by
>>  	 * locking the ABE DPLL on boot.
>> +	 * Lock the ABE DPLL in any case to avoid issues with audio.
>>  	 */
>> -	if (cpu_is_omap446x()) {
>> -		rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck);
>> -		if (!rc)
>> -			rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ);
>> -		if (rc)
>> -			pr_err("%s: failed to configure ABE DPLL!\n", __func__);
>> -	}
>> +	rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck);
>> +	if (!rc)
>> +		rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ);
>> +	if (rc)
>> +		pr_err("%s: failed to configure ABE DPLL!\n", __func__);
>>  
>>  	return 0;
>>  }
> 
> Acked-by: Jon Hunter <jon-hunter@ti.com>
> 
> Cheers
> Jon
> 


-- 
P?ter

[PATCH v2 1/2] ARM: OMAP4: clock data: Lock ABE DPLL on all revisions

[Russell King - ARM Linux]

On Fri, Jan 04, 2013 at 09:10:02AM -0600, Jon Hunter wrote:
> 
> On 01/04/2013 04:09 AM, Peter Ujfalusi wrote:
> > To avoid issues with audio caused by non locked ABE DPLL we should
> > make sure it is locked in all OMAP4 revisions.
> > 
> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> > 
> > asda d
> 
> Not sure what the above is ;-)

And there I was, thinking it was referring to a chain of UK supermarkets. :)

[PATCH v2 1/2] ARM: OMAP4: clock data: Lock ABE DPLL on all revisions

[Paul Walmsley]

On Fri, 4 Jan 2013, Peter Ujfalusi wrote:

> On 01/04/2013 04:10 PM, Jon Hunter wrote:
> > 
> > On 01/04/2013 04:09 AM, Peter Ujfalusi wrote:
> >> To avoid issues with audio caused by non locked ABE DPLL we should
> >> make sure it is locked in all OMAP4 revisions.
> >>
> >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> >>
> >> asda d
> > 
> > Not sure what the above is ;-)
> 
> Argh, squashed patches without commit message cleanup...
> Paul: can you fix this up, or should I resend?

No worries, I'll fix it up here :-)


- Paul