| 1 | --- a/arch/arm/mach-omap2/omap_hwmod.c |
| 2 | +++ b/arch/arm/mach-omap2/omap_hwmod.c |
| 3 | @@ -146,6 +146,8 @@ |
| 4 | #include <plat/omap_hwmod.h> |
| 5 | #include <plat/prcm.h> |
| 6 | |
| 7 | +#include <asm/mach-types.h> |
| 8 | + |
| 9 | #include "cm2xxx_3xxx.h" |
| 10 | #include "cminst44xx.h" |
| 11 | #include "prm2xxx_3xxx.h" |
| 12 | @@ -1769,6 +1771,16 @@ static int _setup(struct omap_hwmod *oh, |
| 13 | |
| 14 | oh->_state = _HWMOD_STATE_INITIALIZED; |
| 15 | |
| 16 | + if (machine_is_nokia770() || |
| 17 | + machine_is_nokia_n800() || |
| 18 | + machine_is_nokia_n810() || |
| 19 | + machine_is_nokia_n810_wimax()) { |
| 20 | + /* Nokia N-series workaround: Don't reset any hwmod. Some drivers expect |
| 21 | + * the NOLO bootloader initializations to be effective. */ |
| 22 | + oh->flags |= HWMOD_INIT_NO_RESET; |
| 23 | + printk_once(KERN_INFO "Nokia N-series HWMOD_INIT_NO_RESET workaround enabled\n"); |
| 24 | + } |
| 25 | + |
| 26 | /* |
| 27 | * In the case of hwmod with hardreset that should not be |
| 28 | * de-assert at boot time, we have to keep the module |
| 29 | |