Skip to content

Commit

Permalink
tty: serial: lpuart: add imx7ulp support
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dong Aisheng authored and gregkh committed Jun 29, 2017
1 parent f2422fe commit 24b1e5f
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/tty/serial/fsl_lpuart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -259,6 +262,7 @@ struct lpuart_port {

struct lpuart_soc_data {
char iotype;
u8 reg_off;
};

static const struct lpuart_soc_data vf_data = {
Expand All @@ -269,9 +273,15 @@ 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);
Expand Down Expand Up @@ -2019,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;
sport->port.dev = &pdev->dev;
sport->port.type = PORT_LPUART;
Expand Down

0 comments on commit 24b1e5f

Please sign in to comment.