patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added to tty-next

patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added to tty-next

[gregkh]

This is a note to let you know that I've just added the patch titled

    QE-UART: add "fsl,t1040-ucc-uart" to of_device_id

to my tty git tree which can be found at
    git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
in the tty-next branch.

The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release
during the merge window.

If you have any questions about this process, please let me know.


>From 11ca2b7ab432eb90906168c327733575e68d388f Mon Sep 17 00:00:00 2001
From: Zhao Qiang <qiang.zhao@nxp.com>
Date: Wed, 9 Mar 2016 09:48:11 +0800
Subject: QE-UART: add "fsl,t1040-ucc-uart" to of_device_id

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 <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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 1a7dc3c590b1..481eb2989a1e 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);
-- 
2.8.2

RE: patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added to tty-next

[Qiang Zhao]

Hi,

This patch depends on the patch http://patchwork.ozlabs.org/patch/594802/ which add the "fsl,t1040-ucc-uart" bindings.

Best Regards
Zhao Qiang

> -----Original Message-----
> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> Sent: Monday, May 02, 2016 11:28 PM
> To: Qiang Zhao <qiang.zhao@nxp.com>; gregkh@linuxfoundation.org;
> stable@vger.kernel.org
> Subject: patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added to
> tty-next
> 
> 
> This is a note to let you know that I've just added the patch titled
> 
>     QE-UART: add "fsl,t1040-ucc-uart" to of_device_id
> 
> to my tty git tree which can be found at
>     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
> in the tty-next branch.
> 
> The patch will show up in the next release of the linux-next tree (usually
> sometime within the next 24 hours during the week.)
> 
> The patch will also be merged in the next major kernel release during the
> merge window.
> 
> If you have any questions about this process, please let me know.
> 
> 
> From 11ca2b7ab432eb90906168c327733575e68d388f Mon Sep 17 00:00:00 2001
> From: Zhao Qiang <qiang.zhao@nxp.com>
> Date: Wed, 9 Mar 2016 09:48:11 +0800
> Subject: QE-UART: add "fsl,t1040-ucc-uart" to of_device_id
> 
> 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 <stable@vger.kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  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
> 1a7dc3c590b1..481eb2989a1e 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);
> --
> 2.8.2
> 

Re: patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added to tty-next

[gregkh]

On Tue, May 03, 2016 at 03:10:16AM +0000, Qiang Zhao wrote:
> Hi,
> 
> This patch depends on the patch
> http://patchwork.ozlabs.org/patch/594802/ which add the
> "fsl,t1040-ucc-uart" bindings.

That's ok, it should all still work, after things get merged together,
right?

thanks,

greg k-h

RE: patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added to tty-next

[Qiang Zhao]

On Tue, May 03, 2016 at 11:11PM, greg k-h wrote:
> -----Original Message-----
> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, May 03, 2016 11:11 PM
> To: Qiang Zhao <qiang.zhao@nxp.com>
> Cc: stable@vger.kernel.org
> Subject: Re: patch "QE-UART: add "fsl,t1040-ucc-uart" to of_device_id" added
> to tty-next
> 
> On Tue, May 03, 2016 at 03:10:16AM +0000, Qiang Zhao wrote:
> > Hi,
> >
> > This patch depends on the patch
> > http://patchwork.ozlabs.org/patch/594802/ which add the
> > "fsl,t1040-ucc-uart" bindings.
> 
> That's ok, it should all still work, after things get merged together, right?
> 
> thanks,

Yes, Thanks.

-Qiang Zhao