aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-06-14 17:08:03 +0800
committerAlex Shi <alex.shi@linaro.org>2016-06-14 17:08:03 +0800
commit9ad8208bd7d0a5d9e232142d95f94bddc35ffff7 (patch)
tree7cdc0808be3bf18db4c44aafc56d565770d297cb /drivers/tty
parentcf5ba83bb248452b5b320d8f2ee48bd90e5cf3f6 (diff)
parentc66b2190a13e321233ac1349d238d699dffefe09 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/ucc_uart.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 73190f5d2832..71d26c8e1b8f 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1478,6 +1478,9 @@ static const struct of_device_id ucc_uart_match[] = {
.type = "serial",
.compatible = "ucc_uart",
},
+ {
+ .compatible = "fsl,t1040-ucc-uart",
+ },
{},
};
MODULE_DEVICE_TABLE(of, ucc_uart_match);