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

Commit 7f4d3641 authored by Roger Quadros's avatar Roger Quadros Committed by Paul Walmsley
Browse files

ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module 



Unlike what the comment states, errata i660 does not state that we
can't RESET the USB host module. Instead it states that RESET is the
only way to recover from a deadlock situation.

RESET ensures that the module is in a known good state irrespective
of what bootloader does with the module, so it must be done at boot.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> # Panda, BeagleXM
Fixes: de231388 ("ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3")
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 313a76ee

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+3 −10
Original line number Diff line number Diff line
@@ -1943,7 +1943,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = { 
	.syss_offs	= 0x0014,

	.sysc_flags	= (SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |

			   SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |

			   SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),

			   SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |

			   SYSS_HAS_RESET_STATUS),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type1,
@@ -2021,15 +2022,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { 
	 * hence HWMOD_SWSUP_MSTANDBY

	 */



	/*

	 * During system boot; If the hwmod framework resets the module

	 * the module will have smart idle settings; which can lead to deadlock

	 * (above Errata Id:i660); so, dont reset the module during boot;

	 * Use HWMOD_INIT_NO_RESET.

	 */



	.flags		= HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |

			  HWMOD_INIT_NO_RESET,

	.flags		= HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,

};



/*