Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c131902 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

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

Two small OMAP fixes for v3.15-rc.  One fixes "slow motion" or
"choppy" audio playback on OMAP5.  The other applies an OMAP3630 fix
for clock rate setting for camera to other OMAP3 chips.

Basic build, boot, and PM test results are available here:

http://www.pwsan.com/omap/testlogs/prcm-fixes-b-v3.15-rc/20140514112639/
parents 89ca3b88 0f9e19ad

arch/arm/mach-omap2/cclock3xxx_data.c

+2 −1
Original line number Diff line number Diff line
@@ -456,7 +456,8 @@ static struct clk_hw_omap dpll4_m5x2_ck_hw = { 
	.clkdm_name	= "dpll4_clkdm",

};



DEFINE_STRUCT_CLK(dpll4_m5x2_ck, dpll4_m5x2_ck_parent_names, dpll4_m5x2_ck_ops);

DEFINE_STRUCT_CLK_FLAGS(dpll4_m5x2_ck, dpll4_m5x2_ck_parent_names,

			dpll4_m5x2_ck_ops, CLK_SET_RATE_PARENT);



static struct clk dpll4_m5x2_ck_3630 = {

	.name		= "dpll4_m5x2_ck",

arch/arm/mach-omap2/omap_hwmod_54xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static struct omap_hwmod omap54xx_mcpdm_hwmod = { 
	 * current exception.

	 */



	.flags		= HWMOD_EXT_OPT_MAIN_CLK,

	.flags		= HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE,

	.main_clk	= "pad_clks_ck",

	.prcm = {

		.omap4 = {