diff options
author | Rob Herring <robh@kernel.org> | 2015-01-26 23:50:08 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 13:11:28 -0500 |
commit | 6ad991b699b4e74af980d08086a99badcb175b37 (patch) | |
tree | 4b03980294779a38e3f1031293f2544f144a607b /drivers/tty/serial/of_serial.c | |
parent | 6d01bb9dc82a60580f749062a48cb47cd5caca07 (diff) |
tty/serial: of_serial: add support for PXA/MMP uarts
Add mrvl,pxa-uart and mrvl,mmp-uart compatible strings for the of_serial
driver. These are 8250 variants which have a port type of PORT_XSCALE.
There is also the serial driver pxa.c with these compatible strings
already. However, it can be replaced with the common 8250 driver. It has
some issues like it cannot coexist with the 8250 driver due to tty name
collision. That also means adding these compatible strings here should
not case a problem.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 3194b42c97c0..fbb719c89a61 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c | |||
@@ -335,6 +335,10 @@ static struct of_device_id of_platform_serial_table[] = { | |||
335 | .data = (void *)PORT_ALTR_16550_F64, }, | 335 | .data = (void *)PORT_ALTR_16550_F64, }, |
336 | { .compatible = "altr,16550-FIFO128", | 336 | { .compatible = "altr,16550-FIFO128", |
337 | .data = (void *)PORT_ALTR_16550_F128, }, | 337 | .data = (void *)PORT_ALTR_16550_F128, }, |
338 | { .compatible = "mrvl,mmp-uart", | ||
339 | .data = (void *)PORT_XSCALE, }, | ||
340 | { .compatible = "mrvl,pxa-uart", | ||
341 | .data = (void *)PORT_XSCALE, }, | ||
338 | #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL | 342 | #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL |
339 | { .compatible = "ibm,qpace-nwp-serial", | 343 | { .compatible = "ibm,qpace-nwp-serial", |
340 | .data = (void *)PORT_NWPSERIAL, }, | 344 | .data = (void *)PORT_NWPSERIAL, }, |