From: Tony Lindgren <tony@atomide.com>
Date: Fri, 7 Jun 2013 21:55:04 +0000 (-0700)
Subject: ARM: OMAP2+: Fix serial init for device tree based booting
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82702ea11ddfe0e43382e1fa5b66d807d8114916;p=linux-beck.git

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>
---

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;