diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-18 13:33:09 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-18 13:33:09 -0700 |
| commit | 443d7920a5ea454b4d46839a029fb26fd5a2cdee (patch) | |
| tree | 63e5b0a380ca92440059be6256bc231bdacdd969 /arch/arm | |
| parent | 207b504a63b849519cc285c3ddb37411d67beead (diff) | |
| parent | ed293d1ad2b0c28b6abc3bd728b07754bc00f1cd (diff) | |
| download | op-kernel-dev-443d7920a5ea454b4d46839a029fb26fd5a2cdee.zip op-kernel-dev-443d7920a5ea454b4d46839a029fb26fd5a2cdee.tar.gz | |
Merge tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Fix omap PM regression in Linux next and kill set_irq_flags usage
for GPMC.
* tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
memory: kill off set_irq_flags usage
ARM: OMAP2+: Fix power domain operations regression caused by 81xx
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomains3xxx_data.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c index 7829d27..d31c495 100644 --- a/arch/arm/mach-omap2/powerdomains3xxx_data.c +++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c @@ -580,7 +580,9 @@ void __init omap3xxx_powerdomains_init(void) if (!cpu_is_omap34xx() && !cpu_is_ti81xx()) return; - pwrdm_register_platform_funcs(&ti81xx_pwrdm_operations); + /* Only 81xx needs custom pwrdm_operations */ + if (!cpu_is_ti81xx()) + pwrdm_register_platform_funcs(&omap3_pwrdm_operations);; rev = omap_rev(); @@ -588,9 +590,11 @@ void __init omap3xxx_powerdomains_init(void) pwrdm_register_pwrdms(powerdomains_am35x); } else if (rev == TI8148_REV_ES1_0 || rev == TI8148_REV_ES2_0 || rev == TI8148_REV_ES2_1) { + pwrdm_register_platform_funcs(&ti81xx_pwrdm_operations); pwrdm_register_pwrdms(powerdomains_ti814x); } else if (rev == TI8168_REV_ES1_0 || rev == TI8168_REV_ES1_1 || rev == TI8168_REV_ES2_0 || rev == TI8168_REV_ES2_1) { + pwrdm_register_platform_funcs(&ti81xx_pwrdm_operations); pwrdm_register_pwrdms(powerdomains_ti816x); } else { pwrdm_register_pwrdms(powerdomains_omap3430_common); |
