diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-24 18:24:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-24 18:24:54 -0400 |
commit | 0b37004dd0113db3b23840b4fd8835dae2395acc (patch) | |
tree | c394ab3f6fc315dbfa890b768584a5d7b730d5a8 | |
parent | 14a8d47d4e9f51372996914c16bdbf1c34e209b5 (diff) |
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>
-rw-r--r-- | Documentation/devicetree/bindings/tty/serial/of-serial.txt | 1 | ||||
-rw-r--r-- | drivers/tty/serial/of_serial.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt index b7ceaaa7602d..b8b27b0aca10 100644 --- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt +++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt | |||
@@ -3,7 +3,6 @@ | |||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : one of: | 4 | - compatible : one of: |
5 | - "ns8250" | 5 | - "ns8250" |
6 | - "ns8250dw" | ||
7 | - "ns16450" | 6 | - "ns16450" |
8 | - "ns16550a" | 7 | - "ns16550a" |
9 | - "ns16550" | 8 | - "ns16550" |
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 024926c3be57..e58cece6f443 100644 --- 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, | |||
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 | |||
87 | port->type = type; | 81 | port->type = type; |
88 | port->uartclk = clk; | 82 | port->uartclk = clk; |
89 | port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP | 83 | port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP |
@@ -182,7 +176,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev) | |||
182 | */ | 176 | */ |
183 | static struct of_device_id __devinitdata of_platform_serial_table[] = { | 177 | static struct of_device_id __devinitdata of_platform_serial_table[] = { |
184 | { .compatible = "ns8250", .data = (void *)PORT_8250, }, | 178 | { .compatible = "ns8250", .data = (void *)PORT_8250, }, |
185 | { .compatible = "ns8250dw", .data = (void *)PORT_8250, }, | ||
186 | { .compatible = "ns16450", .data = (void *)PORT_16450, }, | 179 | { .compatible = "ns16450", .data = (void *)PORT_16450, }, |
187 | { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, | 180 | { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, |
188 | { .compatible = "ns16550", .data = (void *)PORT_16550, }, | 181 | { .compatible = "ns16550", .data = (void *)PORT_16550, }, |