[added to the 3.18 stable tree] QE-UART: add "fsl,t1040-ucc-uart" to of_device_id
From: Sasha Levin <hidden>
Date: 2016-06-03 21:47:21
Subsystem:
freescale quicc engine ucc uart driver, the rest, tty layer and serial drivers · Maintainers:
Timur Tabi, Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
From: Zhao Qiang <qiang.zhao@nxp.com> This patch has been added to the 3.18 stable tree. If you have any objections, please let us know. =============== [ Upstream commit 11ca2b7ab432eb90906168c327733575e68d388f ] New bindings use "fsl,t1040-ucc-uart" as the compatible for qe-uart. So add it. Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> Cc: stable <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <redacted> --- drivers/tty/serial/ucc_uart.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index c107a0f..c859eab 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c@@ -1478,6 +1478,9 @@ static struct of_device_id ucc_uart_match[] = { .type = "serial", .compatible = "ucc_uart", }, + { + .compatible = "fsl,t1040-ucc-uart", + }, {}, }; MODULE_DEVICE_TABLE(of, ucc_uart_match);
--
2.5.0