aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong Aisheng <aisheng.dong@nxp.com>2017-06-12 22:55:52 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-29 11:12:34 -0400
commit24b1e5f0e83c2aced8096473d20c4cf6c1355f30 (patch)
treed2e12a752f6d06393830f6ad44facecb511e5187
parentf2422fe43790204b98d3de823c332477b38242f7 (diff)
tty: serial: lpuart: add imx7ulp support
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>
-rw-r--r--drivers/tty/serial/fsl_lpuart.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index ed0bf180ceb4..94863333f48b 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -231,6 +231,9 @@
231#define DEV_NAME "ttyLP" 231#define DEV_NAME "ttyLP"
232#define UART_NR 6 232#define UART_NR 6
233 233
234/* IMX lpuart has four extra unused regs located at the beginning */
235#define IMX_REG_OFF 0x10
236
234struct lpuart_port { 237struct lpuart_port {
235 struct uart_port port; 238 struct uart_port port;
236 struct clk *clk; 239 struct clk *clk;
@@ -259,6 +262,7 @@ struct lpuart_port {
259 262
260struct lpuart_soc_data { 263struct lpuart_soc_data {
261 char iotype; 264 char iotype;
265 u8 reg_off;
262}; 266};
263 267
264static const struct lpuart_soc_data vf_data = { 268static const struct lpuart_soc_data vf_data = {
@@ -269,9 +273,15 @@ static const struct lpuart_soc_data ls_data = {
269 .iotype = UPIO_MEM32BE, 273 .iotype = UPIO_MEM32BE,
270}; 274};
271 275
276static struct lpuart_soc_data imx_data = {
277 .iotype = UPIO_MEM32,
278 .reg_off = IMX_REG_OFF,
279};
280
272static const struct of_device_id lpuart_dt_ids[] = { 281static const struct of_device_id lpuart_dt_ids[] = {
273 { .compatible = "fsl,vf610-lpuart", .data = &vf_data, }, 282 { .compatible = "fsl,vf610-lpuart", .data = &vf_data, },
274 { .compatible = "fsl,ls1021a-lpuart", .data = &ls_data, }, 283 { .compatible = "fsl,ls1021a-lpuart", .data = &ls_data, },
284 { .compatible = "fsl,imx7ulp-lpuart", .data = &imx_data, },
275 { /* sentinel */ } 285 { /* sentinel */ }
276}; 286};
277MODULE_DEVICE_TABLE(of, lpuart_dt_ids); 287MODULE_DEVICE_TABLE(of, lpuart_dt_ids);
@@ -2019,6 +2029,7 @@ static int lpuart_probe(struct platform_device *pdev)
2019 if (IS_ERR(sport->port.membase)) 2029 if (IS_ERR(sport->port.membase))
2020 return PTR_ERR(sport->port.membase); 2030 return PTR_ERR(sport->port.membase);
2021 2031
2032 sport->port.membase += sdata->reg_off;
2022 sport->port.mapbase = res->start; 2033 sport->port.mapbase = res->start;
2023 sport->port.dev = &pdev->dev; 2034 sport->port.dev = &pdev->dev;
2024 sport->port.type = PORT_LPUART; 2035 sport->port.type = PORT_LPUART;