[PATCHv3,1/3] OMAP UART: Add omap-serial driver support.

Commit Message

Kevin Hilman Nov. 24, 2009, 7:58 p.m. UTC

None

Patch

diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 4341fae..86bec82 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -28,7 +28,7 @@ 
  * in bootargs we specify as console=ttyO0 if uart1
  * is used as console uart.
  */
-#define DEVICE_NAME	"ttyO"
+#define DEVICE_NAME	"ttyS"
 
 /* *
  * We default to IRQ0 for the "no irq" hack.   Some
diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c
index 6dd8bb4..65d05f8 100644
--- a/drivers/serial/omap-serial.c
+++ b/drivers/serial/omap-serial.c
@@ -993,7 +993,7 @@  static struct console serial_omap_console = {
 
 static void serial_omap_add_console_port(struct uart_omap_port *up)
 {
-	serial_omap_console_ports[up->pdev->id - 1] = up;
+	serial_omap_console_ports[up->pdev->id] = up;
 }
 
 #define OMAP_CONSOLE	(&serial_omap_console)
@@ -1237,7 +1237,7 @@  static int serial_omap_probe(struct platform_device *pdev)
 	up->port.regshift = 2;
 	up->port.fifosize = 64;
 	up->port.ops = &serial_omap_pops;
-	up->port.line = pdev->id - 1;
+	up->port.line = pdev->id;
 	up->port.membase = ioremap_nocache(up->port.mapbase,
 					0x16 << up->port.regshift);
 	up->port.flags = UPF_BOOT_AUTOCONF;
@@ -1263,7 +1263,7 @@  static int serial_omap_probe(struct platform_device *pdev)
 		pr_err("\n %s: UART Driver Init Failed!\n", __func__);
 		return -EPERM;
 	}
-	ui[pdev->id - 1] = up;
+	ui[pdev->id] = up;
 	serial_omap_add_console_port(up);
 
 	ret = uart_add_one_port(&serial_omap_reg, &up->port);
@@ -1298,7 +1298,7 @@  static struct platform_driver serial_omap_driver = {
 	.suspend	= serial_omap_suspend,
 	.resume		= serial_omap_resume,
 	.driver		= {
-		.name	= "omap-uart",
+		.name	= DRIVER_NAME,
 	},
 };