Commit ec490f6f authored Apr 01, 2016 by Nishanth Menon Committed by Tony Lindgren Apr 08, 2016

ARM: OMAP: DRA7: Provide proper class to omap2_set_globals_tap



When commit 06c2d368 ("ARM: OMAP: DRA7: Make use of omap_revision
information for soc_is* calls") introduced SoC check using
omap_revision, it missed providing DRA7 as class for initializing
the omap_version variable. Without doing this, soc_is_dra7xx() will
fail and as a result, omap4_pm_init_early never initializes the dra7
erratum for CPU power state. This causes the suspend path to fail
on DRA7 devices.

Fixes: 06c2d368 ("ARM: OMAP: DRA7: Make use of omap_revision information for soc_is* calls")
Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent c783e6fd

arch/arm/mach-omap2/io.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -736,7 +736,8 @@ void __init omap5_init_late(void)
		#ifdef CONFIG_SOC_DRA7XX
		void __init dra7xx_init_early(void)
		{
		omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));
		omap2_set_globals_tap(DRA7XX_CLASS,
		OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));
		omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
		omap2_control_base_init();
		omap4_pm_init_early();

Admin message