Parcourir la source

OMAP: PM: disable idle on suspend for GPIO and UART

Until these drivers are runtime PM converted, their device power
states are managed by calling custom driver hooks late in the
idle/suspend path.  Therefore, do not let the suspend/resume core code
automatically idle these devices since they will be managed manually
by the OMAP PM core very late in the idle/suspend path.

Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Kevin Hilman il y a 14 ans
Parent
commit
c8c9fda506
2 fichiers modifiés avec 3 ajouts et 0 suppressions
  1. 2 0
      arch/arm/mach-omap2/gpio.c
  2. 1 0
      arch/arm/mach-omap2/serial.c

+ 2 - 0
arch/arm/mach-omap2/gpio.c

@@ -87,6 +87,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
 		return PTR_ERR(od);
 	}
 
+	omap_device_disable_idle_on_suspend(od);
+
 	gpio_bank_count++;
 	return 0;
 }

+ 1 - 0
arch/arm/mach-omap2/serial.c

@@ -805,6 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
 	WARN(IS_ERR(od), "Could not build omap_device for %s: %s.\n",
 	     name, oh->name);
 
+	omap_device_disable_idle_on_suspend(od);
 	oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
 
 	uart->irq = oh->mpu_irqs[0].irq;