diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
| commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
| tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /arch/arm/mach-omap2/serial.c | |
| parent | 32111abb508424d1d110fa471d940160abe251f5 (diff) | |
| parent | dc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff) | |
Merge branch 'spi-tegra' into spi-next
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 0405c8190803..a507cd6cf4f1 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -329,6 +329,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, | |||
| 329 | 329 | ||
| 330 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); | 330 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); |
| 331 | 331 | ||
| 332 | if (console_uart_id == bdata->id) { | ||
| 333 | omap_device_enable(pdev); | ||
| 334 | pm_runtime_set_active(&pdev->dev); | ||
| 335 | } | ||
| 336 | |||
| 332 | oh->dev_attr = uart; | 337 | oh->dev_attr = uart; |
| 333 | 338 | ||
| 334 | if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) | 339 | if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) |