ARM: OMAP2: UART: fix console UART mismatched runtime PM status
Subsystems (3)
PATCH v2 1/1 ARM: OMAP2: UART: fix console UART mismatched runtime PM status
From: Kevin Hilman <[email protected]>
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.
---
Applies to v3.7-rc1.
v2: call omap_device_enable() only after oh->mux has been initialized
otherwise, IO ring wakeups not properly enabled.
arch/arm/mach-omap2/serial.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/mach-omap2/serial.c +5 -0
@@ -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); +if (console_uart_id == bdata->id) { +omap_device_enable (pdev); +pm_runtime_set_active (&pdev->dev); + } + oh->dev_attr = uart; if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)
Signature · 1 line
1.7.9.2
PATCH v2 1/1 ARM: OMAP2: UART: fix console UART mismatched runtime PM status
Hi,
Quoted 39 lines · Kevin Hilman
From: Kevin Hilman <[email protected]>
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 duringomap_deviceinit 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_deviceshould 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 usepm_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 <[email protected]>Cc Felipe Balbi <[email protected]>Cc Sourav Poddar <[email protected]>Signed-off-by Kevin Hilman <[email protected]>---
Applies to v3.7-rc1.
v2: callomap_device_enable()only afteroh->muxhas been initialized
otherwise, IO ring wakeups not properly enabled.arch/arm/mach-omap2/serial.c | 5 +++++ 1 file changed, 5 insertions(+)arch/arm/mach-omap2/serial.c +0
-0@@ -329,6 +329,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
arch/arm/mach-omap2/serial.c void __init omap_serial_init_port(struct omap_board_data *bdata, · line 339
Quoted 10 lines
arch/arm/mach-omap2/serial.c +5
-0oh->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; if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)
Tested on 3630/Beagle-xm, 4430/Panda, 4430/Sdp, 5430/Evm.