aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-08-16 12:47:47 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-23 13:54:19 -0400
commit14a8d47d4e9f51372996914c16bdbf1c34e209b5 (patch)
tree68df1fadbf0caf85c0d0aa239ece243d8ee1d8fb
parent6b1a98d1c4851235d9b6764b3f7b7db7909fc760 (diff)
tty: of_serial: add support for the DesignWare 8250
Support the DesignWare 8250 by a new compatible string and registering the DesignWare helpers. If the registration of the helpers fails, then continue as a normal 8250 as we may still get some useful debug out. Cc: Alan Cox <alan@linux.intel.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--Documentation/devicetree/bindings/tty/serial/of-serial.txt1
-rw-r--r--drivers/tty/serial/of_serial.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
index b8b27b0aca10..b7ceaaa7602d 100644
--- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt
+++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
@@ -3,6 +3,7 @@
3Required properties: 3Required properties:
4- compatible : one of: 4- compatible : one of:
5 - "ns8250" 5 - "ns8250"
6 - "ns8250dw"
6 - "ns16450" 7 - "ns16450"
7 - "ns16550a" 8 - "ns16550a"
8 - "ns16550" 9 - "ns16550"
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index e58cece6f443..024926c3be57 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -78,6 +78,12 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
78 } 78 }
79 } 79 }
80 80
81 if (of_device_is_compatible(np, "ns8250dw")) {
82 ret = serial8250_use_designware_io(port);
83 if (ret)
84 dev_warn(&ofdev->dev, "unable to register DesignWare 8250 helpers, continuing as a normal 8250\n");
85 }
86
81 port->type = type; 87 port->type = type;
82 port->uartclk = clk; 88 port->uartclk = clk;
83 port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP 89 port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
@@ -176,6 +182,7 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
176 */ 182 */
177static struct of_device_id __devinitdata of_platform_serial_table[] = { 183static struct of_device_id __devinitdata of_platform_serial_table[] = {
178 { .compatible = "ns8250", .data = (void *)PORT_8250, }, 184 { .compatible = "ns8250", .data = (void *)PORT_8250, },
185 { .compatible = "ns8250dw", .data = (void *)PORT_8250, },
179 { .compatible = "ns16450", .data = (void *)PORT_16450, }, 186 { .compatible = "ns16450", .data = (void *)PORT_16450, },
180 { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, 187 { .compatible = "ns16550a", .data = (void *)PORT_16550A, },
181 { .compatible = "ns16550", .data = (void *)PORT_16550, }, 188 { .compatible = "ns16550", .data = (void *)PORT_16550, },