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>

diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
index 337a7e51faca6c9369bd6cae1f6406a14ccde270..b8b27b0aca108ebc366fab5133f49c789192f307 100644 (file)
--- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt
+++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
@@ -8,7 +8,7 @@ Required properties:
        - "ns16550"
        - "ns16750"
        - "ns16850"
-       - "nvidia,tegra250-uart"
+       - "nvidia,tegra20-uart"
        - "ibm,qpace-nwp-serial"
        - "serial" if the port type is unknown.
 - 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 dbfbfda275379a6c40de6dd5d18f2d75841fbaea..e58cece6f443a6bb8d48ababf6a74e4846c63557 100644 (file)
--- 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[] = {
        { .compatible = "ns16550",  .data = (void *)PORT_16550, },
        { .compatible = "ns16750",  .data = (void *)PORT_16750, },
        { .compatible = "ns16850",  .data = (void *)PORT_16850, },
+       { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, },
 #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
        { .compatible = "ibm,qpace-nwp-serial",
                .data = (void *)PORT_NWPSERIAL, },