From: Andy Duan <fugang.duan@nxp.com>
To: "A.s. Dong" <aisheng.dong@nxp.com>,
        "linux-serial@vger.kernel.org" <linux-serial@vger.kernel.org>
CC: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "jslaby@suse.com" <jslaby@suse.com>,
        "stefan@agner.ch" <stefan@agner.ch>, Mingkai Hu <mingkai.hu@nxp.com>,
        "Y.b. Lu" <yangbo.lu@nxp.com>,
        "nikita.yoush@cogentembedded.com" <nikita.yoush@cogentembedded.com>,
        "andy.shevchenko@gmail.com" <andy.shevchenko@gmail.com>,
        "dongas86@gmail.com" <dongas86@gmail.com>,
        "A.s. Dong" <aisheng.dong@nxp.com>
Subject: RE: [PATCH V3 5/7] tty: serial: lpuart: add imx7ulp support
Thread-Topic: [PATCH V3 5/7] tty: serial: lpuart: add imx7ulp support
Thread-Index: AQHS45HTSLj7uFYtZ0+jgzg+FOoUiKIiGkXA
Date: Tue, 13 Jun 2017 03:02:27 +0000
Message-ID: <AM4PR0401MB22607CE9EE3909A7A0B9451AFFC20@AM4PR0401MB2260.eurprd04.prod.outlook.com>
References: <1497281848-12995-1-git-send-email-aisheng.dong@nxp.com>
 <1497281848-12995-6-git-send-email-aisheng.dong@nxp.com>
In-Reply-To: <1497281848-12995-6-git-send-email-aisheng.dong@nxp.com>
Accept-Language: zh-CN, en-US
Content-Language: en-US
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jun 2017 03:02:27.5239
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2537
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v5D32ikb007147
Content-Length: 2694
Lines: 83

From: Dong Aisheng <aisheng.dong@nxp.com> Sent: Monday, June 12, 2017 11:37 PM
>The lpuart of imx7ulp is basically the same as ls1021a. It's also
>32 bit width register, but unlike ls1021a, it's little endian.
>Besides that, imx7ulp lpuart has a minor different register layout from ls1021a
>that it has four extra registers (verid, param, global,
>pincfg) located at the beginning of register map, which are currently not used
>by the driver and less to be used later.
>
>To ease the register difference handling, we add a reg_off member in
>lpuart_soc_data structure to represent if the normal lpuart32_{read|write}
>requires plus a offset to hide the issue.
>
>Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>Cc: Jiri Slaby <jslaby@suse.com>
>Cc: Stefan Agner <stefan@agner.ch>
>Cc: Mingkai Hu <Mingkai.Hu@nxp.com>
>Cc: Yangbo Lu <yangbo.lu@nxp.com>
>Cc: Fugang Duan <fugang.duan@nxp.com>
>Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
>
>---
>ChangeLog:
>v2->v3:
> * use standard port->iotype to represent the endians.
>v1->v2:
> * remove lpuart_reg_off according to Stefan's suggestion
>---
> drivers/tty/serial/fsl_lpuart.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
>diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index
>bbf47a0..9d05e53 100644
>--- a/drivers/tty/serial/fsl_lpuart.c
>+++ b/drivers/tty/serial/fsl_lpuart.c
>@@ -231,6 +231,9 @@
> #define DEV_NAME	"ttyLP"
> #define UART_NR		6
>
>+/* IMX lpuart has four extra unused regs located at the beginning */
>+#define IMX_REG_OFF	0x10
>+
> struct lpuart_port {
> 	struct uart_port	port;
> 	struct clk		*clk;
>@@ -259,6 +262,7 @@ struct lpuart_port {
>
> struct lpuart_soc_data {
> 	char	iotype;
>+	u8	reg_off;
> };
>
> static const struct lpuart_soc_data vf_data = { @@ -267,12 +271,17 @@ static
>const struct lpuart_soc_data vf_data = {
>
> static const struct lpuart_soc_data ls_data = {
> 	.iotype = UPIO_MEM32BE,
>+};
>
>+static struct lpuart_soc_data imx_data = {
>+	.iotype = UPIO_MEM32,
>+	.reg_off = IMX_REG_OFF,
> };
>
> static const struct of_device_id lpuart_dt_ids[] = {
> 	{ .compatible = "fsl,vf610-lpuart",	.data = &vf_data, },
> 	{ .compatible = "fsl,ls1021a-lpuart",	.data = &ls_data, },
>+	{ .compatible = "fsl,imx7ulp-lpuart",	.data = &imx_data, },
> 	{ /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, lpuart_dt_ids); @@ -2020,6 +2029,7 @@ static
>int lpuart_probe(struct platform_device *pdev)
> 	if (IS_ERR(sport->port.membase))
> 		return PTR_ERR(sport->port.membase);
>
>+	sport->port.membase += sdata->reg_off;
> 	sport->port.mapbase = res->start;

Also update the mapbase.

> 	sport->port.dev = &pdev->dev;
> 	sport->port.type = PORT_LPUART;
>--
>2.7.4