diff mbox

ARM: OMAP2+: Fix serial init for device tree based booting

Message ID 20130607215503.GK3331@atomide.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tony Lindgren June 7, 2013, 9:55 p.m. UTC 
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.

Signed-off-by: Tony Lindgren <tony@atomide.com>

Comments

Kevin Hilman June 7, 2013, 10:20 p.m. UTC | #1 
Tony Lindgren <tony@atomide.com> writes:

> 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.
>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

Reviewed-by: Kevin Hilman <khilman@linaro.org>


> --- 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;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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