ARM: OMAP2: UART: fix console UART mismatched runtime PM status
The runtime PM framework assumes that the hardware state of devices when initialized is disabled. For all omap_devices, we idle/disable device by default. However, the console uart uses a "no idle" option during omap_device init in order to allow earlyprintk usage to work seamlessly during boot. Because the hardware is left partially enabled after init (whatever the bootloader settings were), the omap_device should later be fully initialized (including mux) and the runtime PM framework should be told that the device is active, and not disabled so that the hardware state is in sync with runtime PM state. To fix, after the device has been created/registered, call omap_device_enable() to finialize init and use pm_runtime_set_active() to tell the runtime PM core the device is enabled. Tested on 2420/n810, 3530/Overo, 3530/Beagle, 3730/OveroSTORM, 3730/Beagle-xM, 4460/PandaES. Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Felipe Balbi <balbi@ti.com> Cc: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
parent
856c3c5b28
commit
44b1d42a60
|
@ -329,6 +329,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
|
||||||
|
|
||||||
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
|
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
|
||||||
|
|
||||||
|
if (console_uart_id == bdata->id) {
|
||||||
|
omap_device_enable(pdev);
|
||||||
|
pm_runtime_set_active(&pdev->dev);
|
||||||
|
}
|
||||||
|
|
||||||
oh->dev_attr = uart;
|
oh->dev_attr = uart;
|
||||||
|
|
||||||
if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)
|
if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)
|
||||||
|
|
Loading…
Reference in New Issue