Revert "tty: of_serial: add support for the DesignWare 8250"

This reverts commit 14a8d47d4e9f51372996914c16bdbf1c34e209b5.

It causes a build error that needs to be resolved differently.

Cc: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
index b7ceaaa7602dfa76798e7eb7d31cc0a10dcb2343..b8b27b0aca108ebc366fab5133f49c789192f307 100644 (file)
--- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt
+++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
@@ -3,7 +3,6 @@
 Required properties:
 - compatible : one of:
        - "ns8250"
-       - "ns8250dw"
        - "ns16450"
        - "ns16550a"
        - "ns16550"

diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 024926c3be575c0326e440efe7ccbb2b954079e7..e58cece6f443a6bb8d48ababf6a74e4846c63557 100644 (file)
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -78,12 +78,6 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
                }
        }
 
-       if (of_device_is_compatible(np, "ns8250dw")) {
-               ret = serial8250_use_designware_io(port);
-               if (ret)
-                       dev_warn(&ofdev->dev, "unable to register DesignWare 8250 helpers, continuing as a normal 8250\n");
-       }
-
        port->type = type;
        port->uartclk = clk;
        port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
@@ -182,7 +176,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
  */
 static struct of_device_id __devinitdata of_platform_serial_table[] = {
        { .compatible = "ns8250",   .data = (void *)PORT_8250, },
-       { .compatible = "ns8250dw", .data = (void *)PORT_8250, },
        { .compatible = "ns16450",  .data = (void *)PORT_16450, },
        { .compatible = "ns16550a", .data = (void *)PORT_16550A, },
        { .compatible = "ns16550",  .data = (void *)PORT_16550, },