Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/imx/imxuart.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/imx/imxuart.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -p -r1.16.2.1 -r1.16.2.2
--- src/sys/arch/arm/imx/imxuart.c	2015/06/06 14:39:55	1.16.2.1
+++ src/sys/arch/arm/imx/imxuart.c	2015/09/22 12:05:37	1.16.2.2
@@ -1,4 +1,4 @@
-/* $NetBSD: imxuart.c,v 1.16.2.1 2015/06/06 14:39:55 skrll Exp $ */
+/* $NetBSD: imxuart.c,v 1.16.2.2 2015/09/22 12:05:37 skrll Exp $ */
 
 /*
  * Copyright (c) 2009, 2010  Genetec Corporation.  All rights reserved.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.16.2.1 2015/06/06 14:39:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.16.2.2 2015/09/22 12:05:37 skrll Exp $");
 
 #include "opt_imxuart.h"
 #include "opt_ddb.h"
@@ -293,7 +293,7 @@ int	imxuart_common_getc(dev_t, struct im
 void	imxuart_common_putc(dev_t, struct imxuart_regs *, int);
 
 
-int	imxuart_init(struct imxuart_regs *, int, tcflag_t);
+int	imxuart_init(struct imxuart_regs *, int, tcflag_t, int);
 
 int	imxucngetc(dev_t);
 void	imxucnputc(dev_t, int);
@@ -424,6 +424,9 @@ imxuart_attach_common(device_t parent, d
 	callout_init(&sc->sc_diag_callout, 0);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_HIGH);
 
+	if (regsp->ur_iobase != imxuconsregs.ur_iobase)
+		imxuart_init(&sc->sc_regs, TTYDEF_SPEED, TTYDEF_CFLAG, false);
+
 	bus_space_read_region_4(iot, ioh, IMX_UCR1, sc->sc_ucr, 4);
 	sc->sc_ucr2_d = sc->sc_ucr2;
 
@@ -2275,20 +2278,22 @@ imxuart_common_putc(dev_t dev, struct im
 
 	splx(s);
 }
+#endif /* defined(IMXUARTCONSOLE) || defined(KGDB) */
 
 /*
- * Initialize UART for use as console or KGDB line.
+ * Initialize UART
  */
 int
-imxuart_init(struct imxuart_regs *regsp, int rate, tcflag_t cflag)
+imxuart_init(struct imxuart_regs *regsp, int rate, tcflag_t cflag, int domap)
 {
 	struct imxuart_baudrate_ratio ratio;
 	int rfdiv = IMX_UFCR_DIVIDER_TO_RFDIV(imxuart_freqdiv);
 	uint32_t ufcr;
+	int error;
 
-	if (bus_space_map(regsp->ur_iot, regsp->ur_iobase, IMX_UART_SIZE, 0,
-		&regsp->ur_ioh))
-		return ENOMEM; /* ??? */
+	if (domap && (error = bus_space_map(regsp->ur_iot, regsp->ur_iobase,
+	     IMX_UART_SIZE, 0, &regsp->ur_ioh)) != 0)
+		return error;
 
 	if (imxuspeed(rate, &ratio) < 0)
 		return EINVAL;
@@ -2332,9 +2337,6 @@ imxuart_init(struct imxuart_regs *regsp,
 }
 
 
-#endif
-
-
 #ifdef	IMXUARTCONSOLE
 /*
  * Following are all routines needed for UART to act as console
@@ -2355,7 +2357,7 @@ imxuart_cons_attach(bus_space_tag_t iot,
 	regs.ur_iot = iot;
 	regs.ur_iobase = iobase;
 
-	res = imxuart_init(&regs, rate, cflag);
+	res = imxuart_init(&regs, rate, cflag, true);
 	if (res)
 		return (res);
 
@@ -2416,7 +2418,7 @@ imxuart_kgdb_attach(bus_space_tag_t iot,
 		imxu_kgdb_regs.ur_iot = iot;
 		imxu_kgdb_regs.ur_iobase = iobase;
 
-		res = imxuart_init(&imxu_kgdb_regs, rate, cflag);
+		res = imxuart_init(&imxu_kgdb_regs, rate, cflag, true);
 		if (res)
 			return (res);