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/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQ/WNjAAoJEMePsQ0LvSpLV3QP/jBxqb1eDRn+9P58y793XZ8K 0/eAHGkoNTPvBMOtTFnblg4uGNHu6zpCkrWcu0xE8WXNh9wkadXnWHI3iEyoUr2r lRePxBbdIrWzVxQvxxa4ebHiJo/kmk5fs7Pv+xFVRUTHRnQgsCf0aX0RUGwA1XmC 2Qz79coH/MtceGSquOguc//9PWsiQebZtjl/PIz5V3HL3xxlKsA/p9vtpoVFSt8x QgVgtYKB8lMidwToEzR+xErj4t4ollGGs7v02Mx3+4BNqZtsx8ZFrEgxMhBM0cbQ s/wa9hB7z6wPM5CDhMbjmhcD6GHFoT/XELkFfn7QQCW3mr1Dur0hzH2n/KBE9bCV E9vyE65d8FM9J5+2HpCQdMdxG74kBajzUKEtQ6O4E8zBEyBgav3u3z/efvM1STyH Aeo9HtwDswGJm0Ijt9lI52/foIXQfU63TutvEo5bTGgHsucs0TKns25IElyyrzmh n3zig72WNi47ZnYL/jMuJZZ8YSv1CMDSTOBJdhhr+j/aEXxbKa51TbNCm346u567 W3KjNobRIoZqht+k2dMt5fCAxta/cyNvrTy+o3kFk/POaV7i5XXfQTDyHiBVAqBA fHple1lg2QB9rJBMswBuNaEHDhCj+lMVukkQC/NZKSe1C4+woplXm2FutQJZFflT rY9wA3LHkCGkHsxcSpBw =RtJt -----END PGP SIGNATURE----- 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/
This commit is contained in:
Коммит
734bda6320
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
|
|
Загрузка…
Ссылка в новой задаче