diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-07-06 01:42:36 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-09 17:37:43 -0400 |
commit | 2e39e5be1ddf9fc5fbe84fe7ae3e035bb07845e5 (patch) | |
tree | d1ad76d8749f88f37961bc18834bd11ee248949f | |
parent | b98c0239204d6603b3a33bcc2b3916adaa8d4160 (diff) |
tty/serial: Add devicetree support for nVidia Tegra serial ports
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r-- | Documentation/devicetree/bindings/tty/serial/of-serial.txt | 2 | ||||
-rw-r--r-- | drivers/tty/serial/of_serial.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt index 337a7e51faca..b8b27b0aca10 100644 --- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt +++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt | |||
@@ -8,7 +8,7 @@ Required properties: | |||
8 | - "ns16550" | 8 | - "ns16550" |
9 | - "ns16750" | 9 | - "ns16750" |
10 | - "ns16850" | 10 | - "ns16850" |
11 | - "nvidia,tegra250-uart" | 11 | - "nvidia,tegra20-uart" |
12 | - "ibm,qpace-nwp-serial" | 12 | - "ibm,qpace-nwp-serial" |
13 | - "serial" if the port type is unknown. | 13 | - "serial" if the port type is unknown. |
14 | - reg : offset and length of the register set for the device. | 14 | - 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 dbfbfda27537..e58cece6f443 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c | |||
@@ -181,6 +181,7 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = { | |||
181 | { .compatible = "ns16550", .data = (void *)PORT_16550, }, | 181 | { .compatible = "ns16550", .data = (void *)PORT_16550, }, |
182 | { .compatible = "ns16750", .data = (void *)PORT_16750, }, | 182 | { .compatible = "ns16750", .data = (void *)PORT_16750, }, |
183 | { .compatible = "ns16850", .data = (void *)PORT_16850, }, | 183 | { .compatible = "ns16850", .data = (void *)PORT_16850, }, |
184 | { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, }, | ||
184 | #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL | 185 | #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL |
185 | { .compatible = "ibm,qpace-nwp-serial", | 186 | { .compatible = "ibm,qpace-nwp-serial", |
186 | .data = (void *)PORT_NWPSERIAL, }, | 187 | .data = (void *)PORT_NWPSERIAL, }, |