Commit 734bda63 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-fixes-b-for-v3.8-rc' of... 

Merge tag 'omap-fixes-b-for-v3.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8-rc4/fixes

A few OMAP integration fixes for v3.8-rc, for OMAP4 audio and OMAP2 reboot.

Basic test logs are available here:

    http://www.pwsan.com/omap/testlogs/prcm_fixes_c_v3.8-rc/20130121073904/
parents 7d1f9aef bdcc6127

arch/arm/mach-omap2/cclock2420_data.c

+2 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,8 @@ int __init omap2420_clk_init(void) 
			omap2_init_clk_hw_omap_clocks(c->lk.clk);

	}



	omap2xxx_clkt_vps_late_init();



	omap2_clk_disable_autoidle_all();



	omap2_clk_enable_init_clocks(enable_init_clks,

arch/arm/mach-omap2/cclock2430_data.c

+2 −0
Original line number Diff line number Diff line
@@ -2050,6 +2050,8 @@ int __init omap2430_clk_init(void) 
			omap2_init_clk_hw_omap_clocks(c->lk.clk);

	}



	omap2xxx_clkt_vps_late_init();



	omap2_clk_disable_autoidle_all();



	omap2_clk_enable_init_clocks(enable_init_clks,

arch/arm/mach-omap2/cclock44xx_data.c

+6 −7
Original line number Diff line number Diff line
@@ -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__);

	}



	return 0;

}

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+5 −1
Original line number Diff line number Diff line
@@ -2132,8 +2132,12 @@ static struct omap_hwmod omap44xx_mcpdm_hwmod = { 
	 * currently reset very early during boot, before I2C is

	 * available, so it doesn't seem that we have any choice in

	 * the kernel other than to avoid resetting it.

	 *

	 * Also, McPDM needs to be configured to NO_IDLE mode when it

	 * is in used otherwise vital clocks will be gated which

	 * results 'slow motion' audio playback.

	 */

	.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",

CRA Git | Maintained and supported by SUSTech CRA and CCSE