diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:58:01 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:58:01 -0500 |
| commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
| tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/arm/mach-omap2/serial.c | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 812976eac536..aa30a3c20883 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -330,6 +330,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, | |||
| 330 | 330 | ||
| 331 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); | 331 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); |
| 332 | 332 | ||
| 333 | if (console_uart_id == bdata->id) { | ||
| 334 | omap_device_enable(pdev); | ||
| 335 | pm_runtime_set_active(&pdev->dev); | ||
| 336 | } | ||
| 337 | |||
| 333 | oh->dev_attr = uart; | 338 | oh->dev_attr = uart; |
| 334 | 339 | ||
| 335 | if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) | 340 | if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) |