diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-07 23:55:04 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-12 18:44:15 +0200 |
| commit | 82702ea11ddfe0e43382e1fa5b66d807d8114916 (patch) | |
| tree | 6f7ec031f43cf973df16f5391b56eb896f37a36e | |
| parent | arm/omap: use const char properly (diff) | |
| download | linux-82702ea11ddfe0e43382e1fa5b66d807d8114916.tar.xz linux-82702ea11ddfe0e43382e1fa5b66d807d8114916.zip | |
ARM: OMAP2+: Fix serial init for device tree based booting
We don't want to call omap_serial_early_init() for device
tree based booting as the ports are initialized based on
the .dts entries.
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index f6601563aa69..a7cf8d783bd0 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -176,6 +176,9 @@ static char *cmdline_find_option(char *str) static int __init omap_serial_early_init(void) { + if (of_have_populated_dt()) + return -ENODEV; + do { char oh_name[MAX_UART_HWMOD_NAME_LEN]; struct omap_hwmod *oh; |