diff options
| author |   Alan Cox <alan@linux.intel.com> | 2012-07-17 17:06:20 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-17 09:11:50 -0700 |
| commit | ce7240e445303de3ca66e6d08f17a2ec278a5bf6 (patch) | |
| tree | 8ee84f5ae903dcd72e0641ae4932da71cd9a7b4b /drivers/tty/serial/of_serial.c | |
| parent | tty: Fix up PPC fallout from the termios move (diff) | |
| download | linux-dev-ce7240e445303de3ca66e6d08f17a2ec278a5bf6.tar.xz linux-dev-ce7240e445303de3ca66e6d08f17a2ec278a5bf6.zip | |
8250: three way resolve of the 8250 diffs
This resolves the differences between the original 8250 patch, the revised 8250 patch
and the independant clean up of the octeon driver (to use platform devices properly yay!)
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/of_serial.c')
| -rw-r--r-- | drivers/tty/serial/of_serial.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 34e71874a892..ffc7879e85a4 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -144,8 +144,15 @@ static int __devinit of_platform_serial_probe(struct platform_device *ofdev) switch (port_type) { #ifdef CONFIG_SERIAL_8250 case PORT_8250 ... PORT_MAX_8250: - ret = serial8250_register_port(&port); + { + /* For now the of bindings don't support the extra + 8250 specific bits */ + struct uart_8250_port port8250; + memset(&port8250, 0, sizeof(port8250)); + port8250.port = port; + ret = serial8250_register_8250_port(&port8250); break; + } #endif #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL case PORT_NWPSERIAL: |