Commit c02060d8 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP4+: AESS: enable internal auto-gating during initial setup 



Enable the AESS auto-gating control bit during AESS hwmod setup.  This
fixes the following boot warning on OMAP4:

omap_hwmod: aess: _wait_target_disable failed

Without this patch, the AESS IP block does not indicate to the PRCM
that it is idle after it is reset.  This prevents some types of SoC
power management until something sets the auto-gating control bit.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarSebastien Guiriec <s-guiriec@ti.com>
Cc: Benoît Cousson <b-cousson@ti.com>
Cc: Péter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
parent cf8ba171

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ 
	 omap_device.o sram.o



omap-2-3-common				= irq.o

hwmod-common				= omap_hwmod.o \

hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \

					  clkt_dpll.o clkt_clksel.o

arch/arm/mach-omap2/omap_hwmod.h

+6 −0
Original line number Diff line number Diff line
@@ -672,6 +672,12 @@ extern void __init omap_hwmod_init(void); 


const char *omap_hwmod_get_main_clk(struct omap_hwmod *oh);



/*

 *

 */



extern int omap_hwmod_aess_preprogram(struct omap_hwmod *oh);



/*

 * Chip variant-specific hwmod init routines - XXX should be converted

 * to use initcalls once the initial boot ordering is straightened out

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_aess_sysc = { 
static struct omap_hwmod_class omap44xx_aess_hwmod_class = {

	.name	= "aess",

	.sysc	= &omap44xx_aess_sysc,

	.enable_preprogram = omap_hwmod_aess_preprogram,

};



/* aess */

arch/arm/mach-omap2/omap_hwmod_reset.c

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * OMAP IP block custom reset and preprogramming stubs

 *

 * Copyright (C) 2012 Texas Instruments, Inc.

 * Paul Walmsley

 *

 * A small number of IP blocks need custom reset and preprogramming

 * functions.  The stubs in this file provide a standard way for the

 * hwmod code to call these functions, which are to be located under

 * drivers/.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 */

#include <linux/kernel.h>



#include <sound/aess.h>



#include "omap_hwmod.h"



/**

 * omap_hwmod_aess_preprogram - enable AESS internal autogating

 * @oh: struct omap_hwmod *

 *

 * The AESS will not IdleAck to the PRCM until its internal autogating

 * is enabled.  Since internal autogating is disabled by default after

 * AESS reset, we must enable autogating after the hwmod code resets

 * the AESS.  Returns 0.

 */

int omap_hwmod_aess_preprogram(struct omap_hwmod *oh)

{

	void __iomem *va;



	va = omap_hwmod_get_mpu_rt_va(oh);

	if (!va)

		return -EINVAL;



	aess_enable_autogating(va);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE