diff options
| -rw-r--r-- | Documentation/devicetree/bindings/tty/serial/of-serial.txt | 1 | ||||
| -rw-r--r-- | drivers/tty/serial/of_serial.c | 1 |
2 files changed, 2 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..0847fdeee11a 100644 --- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt +++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt | |||
| @@ -9,6 +9,7 @@ Required properties: | |||
| 9 | - "ns16750" | 9 | - "ns16750" |
| 10 | - "ns16850" | 10 | - "ns16850" |
| 11 | - "nvidia,tegra20-uart" | 11 | - "nvidia,tegra20-uart" |
| 12 | - "nxp,lpc3220-uart" | ||
| 12 | - "ibm,qpace-nwp-serial" | 13 | - "ibm,qpace-nwp-serial" |
| 13 | - "serial" if the port type is unknown. | 14 | - "serial" if the port type is unknown. |
| 14 | - reg : offset and length of the register set for the device. | 15 | - reg : offset and length of the register set for the device. |
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 5410c0637266..34e71874a892 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c | |||
| @@ -208,6 +208,7 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = { | |||
| 208 | { .compatible = "ns16750", .data = (void *)PORT_16750, }, | 208 | { .compatible = "ns16750", .data = (void *)PORT_16750, }, |
| 209 | { .compatible = "ns16850", .data = (void *)PORT_16850, }, | 209 | { .compatible = "ns16850", .data = (void *)PORT_16850, }, |
| 210 | { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, }, | 210 | { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, }, |
| 211 | { .compatible = "nxp,lpc3220-uart", .data = (void *)PORT_LPC3220, }, | ||
| 211 | #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL | 212 | #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL |
| 212 | { .compatible = "ibm,qpace-nwp-serial", | 213 | { .compatible = "ibm,qpace-nwp-serial", |
| 213 | .data = (void *)PORT_NWPSERIAL, }, | 214 | .data = (void *)PORT_NWPSERIAL, }, |
