From patchwork Tue Apr 14 06:18:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 47138 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D12B02121F for ; Tue, 14 Apr 2015 06:19:18 +0000 (UTC) Received: by lamp14 with SMTP id p14sf19390lam.3 for ; Mon, 13 Apr 2015 23:19:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=4boBnjyUjU9dFIhMmdQMvOPPnV8FCRvEdNSyHJQbVAY=; b=BRCfrH15U4fvg/A7kxea7xXDGFjcE4WNd7N+Uhae7hUWAH5EHyOhDJSVqjzy4IPQ8b WeUbS/joVVXegNMjXfqlIZrUYLjErM9p93A63N93IDYIsU+m0+IkcLwHSULQiex72Xoy kvthgmI6JADUysetev83x96TZUbj0Zoaa19ZcFJB92KDMbdEqWN/MzNaZLSLlWY8dLOO 0tIGuTOdX2vtUJiS1FM68dvUd766O/OsZUDIlqJHv89cr0Zf1Vv7HhZd2+n71t2GUwxk RFX6Ypk5+ULXJSjOsw9yQZ/1SDttqWXhFOrDpSo1KXVMSBA2rpuZy5fCBPqRQb8uuuPk pfJw== X-Gm-Message-State: ALoCoQlO+f2h5q5YXoFakG1BFbmJMypwy1KE3zT92ITtSrTvvEiISbn5O0LROcLvNEHoPm7QO5uI X-Received: by 10.112.138.2 with SMTP id qm2mr1091092lbb.19.1428992357477; Mon, 13 Apr 2015 23:19:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.74 with SMTP id j10ls1022lag.7.gmail; Mon, 13 Apr 2015 23:19:17 -0700 (PDT) X-Received: by 10.112.170.132 with SMTP id am4mr16422375lbc.89.1428992357186; Mon, 13 Apr 2015 23:19:17 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id c5si10121971lag.135.2015.04.13.23.19.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 23:19:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbqq2 with SMTP id qq2so76730lbb.3 for ; Mon, 13 Apr 2015 23:19:17 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr16194094lac.41.1428992357060; Mon, 13 Apr 2015 23:19:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp1646754lbt; Mon, 13 Apr 2015 23:19:15 -0700 (PDT) X-Received: by 10.68.221.164 with SMTP id qf4mr33469279pbc.1.1428992353574; Mon, 13 Apr 2015 23:19:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ol15si19180155pdb.157.2015.04.13.23.19.12 for ; Mon, 13 Apr 2015 23:19:13 -0700 (PDT) Received-SPF: none (google.com: linux-serial-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751381AbbDNGTL (ORCPT ); Tue, 14 Apr 2015 02:19:11 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34440 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbbDNGTK (ORCPT ); Tue, 14 Apr 2015 02:19:10 -0400 Received: by pacyx8 with SMTP id yx8so229561pac.1 for ; Mon, 13 Apr 2015 23:19:10 -0700 (PDT) X-Received: by 10.68.223.226 with SMTP id qx2mr33442560pbc.71.1428992349938; Mon, 13 Apr 2015 23:19:09 -0700 (PDT) Received: from localhost.localdomain ([107.6.117.179]) by mx.google.com with ESMTPSA id dk5sm9078019pdb.88.2015.04.13.23.19.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Apr 2015 23:19:08 -0700 (PDT) From: Jun Nie To: peter@hurleysoftware.com, linux@arm.linux.org.uk, Andrew.Jackson@arm.com, gregkh@linuxfoundation.org, linux-serial@vger.kernel.org, shawn.guo@linaro.org, zte-lt@lists.linaro.org Cc: Jun Nie Subject: [PATCH v5 2/3] uart: pl011: Add support to ZTE ZX296702 uart Date: Tue, 14 Apr 2015 14:18:42 +0800 Message-Id: <1428992322-29303-1-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-serial-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-serial@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: jun.nie@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Support ZTE uart with some registers differing offset. Probe as platform device for not AMBA IP ID is available on ZTE uart. Signed-off-by: Jun Nie --- drivers/tty/serial/Kconfig | 4 +- drivers/tty/serial/amba-pl011.c | 225 +++++++++++++++++++++++++++++++++++++--- include/linux/amba/serial.h | 14 +++ 3 files changed, 227 insertions(+), 16 deletions(-) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index d2501f0..982ca78 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -47,12 +47,12 @@ config SERIAL_AMBA_PL010_CONSOLE config SERIAL_AMBA_PL011 tristate "ARM AMBA PL011 serial port support" - depends on ARM_AMBA + depends on ARM_AMBA || SOC_ZX296702 select SERIAL_CORE help This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have an Integrator/PP2, Integrator/CP or Versatile platform, say Y or M - here. + here. Say yes if you have SOC_ZX296702. If unsure, say N. diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index c1c27c0..d09c73a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -74,6 +74,10 @@ /* There is by now at least one vendor with differing details, so handle it */ struct vendor_data { unsigned int ifls; + unsigned int fr_busy; + unsigned int fr_dsr; + unsigned int fr_cts; + unsigned int u1_fr_ri; u8 *reg_lut; bool oversampling; bool dma_threshold; @@ -82,13 +86,14 @@ struct vendor_data { unsigned int (*get_fifosize)(struct amba_device *dev); }; +#ifdef CONFIG_ARM_AMBA static unsigned int get_fifosize_arm(struct amba_device *dev) { return amba_rev(dev) < 3 ? 16 : 32; } -static u8 arm_reg[] = { - /* All registers offset are in order except [8]=0x2c */ +static u8 arm_reg[REG_NR] = { + /* All registers offset are in order except LCRH as comment */ [IDX(UART01x_DR)] = UART01x_DR, [IDX(UART01x_RSR)] = UART01x_RSR, [IDX(ST_UART011_DMAWM)] = ST_UART011_DMAWM, @@ -112,6 +117,10 @@ static u8 arm_reg[] = { static struct vendor_data vendor_arm = { .ifls = UART011_IFLS_RX4_8|UART011_IFLS_TX4_8, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .u1_fr_ri = UART011_FR_RI, .reg_lut = arm_reg, .oversampling = false, .dma_threshold = false, @@ -124,7 +133,7 @@ static unsigned int get_fifosize_st(struct amba_device *dev) return 64; } -static u8 st_reg[] = { +static u8 st_reg[REG_NR] = { /* All registers offset are in order */ [IDX(UART01x_DR)] = UART01x_DR, [IDX(UART01x_RSR)] = UART01x_RSR, @@ -149,12 +158,60 @@ static u8 st_reg[] = { static struct vendor_data vendor_st = { .ifls = UART011_IFLS_RX_HALF|UART011_IFLS_TX_HALF, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .u1_fr_ri = UART011_FR_RI, .reg_lut = st_reg, .oversampling = true, .dma_threshold = true, .cts_event_workaround = true, .get_fifosize = get_fifosize_st, }; +#endif + +#ifdef CONFIG_SOC_ZX296702 +static unsigned int get_fifosize_zx(struct amba_device *dev) +{ + return 16; +} + +static u8 zx_reg[REG_NR] = { + /* Registers offset are remapped from origin offset as in comment */ + [IDX(UART01x_DR)] = ZX_UART01x_DR, /* remapped */ + [IDX(UART01x_RSR)] = UART01x_RSR, + [IDX(ST_UART011_DMAWM)] = ST_UART011_DMAWM, + [IDX(UART010_LCRM)] = UART010_LCRM, + [IDX(UART010_LCRL)] = UART010_LCRL, + [IDX(UART010_CR)] = UART010_CR, + [IDX(UART01x_FR)] = ZX_UART01x_FR, /* remapped */ + [IDX(UART011_LCRH_RX)] = UART011_LCRH_RX, + [IDX(UART01x_ILPR)] = UART01x_ILPR, + [IDX(UART011_IBRD)] = UART011_IBRD, + [IDX(UART011_FBRD)] = UART011_FBRD, + [IDX(UART011_LCRH_TX)] = ZX_UART011_LCRH_TX, /* remapped */ + [IDX(UART011_CR)] = ZX_UART011_CR, /* remapped */ + [IDX(UART011_IFLS)] = ZX_UART011_IFLS, /* remapped */ + [IDX(UART011_IMSC)] = ZX_UART011_IMSC, /* remapped */ + [IDX(UART011_RIS)] = UART011_RIS, + [IDX(UART011_MIS)] = ZX_UART011_MIS, /* remapped */ + [IDX(UART011_ICR)] = ZX_UART011_ICR, /* remapped */ + [IDX(UART011_DMACR)] = ZX_UART011_DMACR, /* remapped */ +}; + +static struct vendor_data vendor_zx = { + .ifls = UART011_IFLS_RX4_8|UART011_IFLS_TX4_8, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .u1_fr_ri = ZX_UART011_FR_RI, + .reg_lut = zx_reg, + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .get_fifosize = get_fifosize_zx, +}; +#endif /* Deals with DMA transactions */ @@ -198,6 +255,10 @@ struct uart_amba_port { unsigned int im; /* interrupt mask */ unsigned int old_status; unsigned int fifosize; /* vendor-specific */ + unsigned int fr_busy; /* vendor-specific */ + unsigned int fr_dsr; /* vendor-specific */ + unsigned int fr_cts; /* vendor-specific */ + unsigned int u1_fr_ri; /* vendor-specific */ unsigned int old_cr; /* state during shutdown */ bool autorts; char type[12]; @@ -1160,7 +1221,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap) return; /* Disable RX and TX DMA */ - while (pl011_readw(uap, UART01x_FR) & UART01x_FR_BUSY) + while (pl011_readw(uap, UART01x_FR) & uap->fr_busy) barrier(); spin_lock_irq(&uap->port.lock); @@ -1387,11 +1448,11 @@ static void pl011_modem_status(struct uart_amba_port *uap) if (delta & UART01x_FR_DCD) uart_handle_dcd_change(&uap->port, status & UART01x_FR_DCD); - if (delta & UART01x_FR_DSR) + if (delta & uap->fr_dsr) uap->port.icount.dsr++; - if (delta & UART01x_FR_CTS) - uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS); + if (delta & uap->fr_cts) + uart_handle_cts_change(&uap->port, status & uap->fr_cts); wake_up_interruptible(&uap->port.state->port.delta_msr_wait); } @@ -1458,7 +1519,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port) container_of(port, struct uart_amba_port, port); unsigned int status = pl011_readw(uap, UART01x_FR); - return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ? 0 : TIOCSER_TEMT; + return status & (uap->fr_busy|UART01x_FR_TXFF) ? 0 : TIOCSER_TEMT; } static unsigned int pl011_get_mctrl(struct uart_port *port) @@ -1473,9 +1534,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbit TIOCMBIT(UART01x_FR_DCD, TIOCM_CAR); - TIOCMBIT(UART01x_FR_DSR, TIOCM_DSR); - TIOCMBIT(UART01x_FR_CTS, TIOCM_CTS); - TIOCMBIT(UART011_FR_RI, TIOCM_RNG); + TIOCMBIT(uap->fr_dsr, TIOCM_DSR); + TIOCMBIT(uap->fr_cts, TIOCM_CTS); + TIOCMBIT(uap->u1_fr_ri, TIOCM_RNG); #undef TIOCMBIT return result; } @@ -1678,7 +1739,7 @@ static int pl011_startup(struct uart_port *port) pl011_writew(uap, 1, UART011_IBRD); pl011_write_lcr_h(uap, 0); pl011_writew(uap, 0, UART01x_DR); - while (pl011_readw(uap, UART01x_FR) & UART01x_FR_BUSY) + while (pl011_readw(uap, UART01x_FR) & uap->fr_busy) barrier(); pl011_writew(uap, fbrd, UART011_FBRD); @@ -2023,6 +2084,9 @@ static struct uart_amba_port *amba_ports[UART_NR]; static void pl011_console_putchar(struct uart_port *port, int ch) { + struct uart_amba_port *uap = + container_of(port, struct uart_amba_port, port); + while (pl011_readw(uap, UART01x_FR) & UART01x_FR_TXFF) barrier(); pl011_writew(uap, ch, UART01x_DR); @@ -2062,7 +2126,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) */ do { status = pl011_readw(uap, UART01x_FR); - } while (status & UART01x_FR_BUSY); + } while (status & uap->fr_busy); pl011_writew(uap, old_cr, UART011_CR); if (locked) @@ -2173,7 +2237,7 @@ static void pl011_putc(struct uart_port *port, int c) while (pl011_readw(uap, UART01x_FR) & UART01x_FR_TXFF) ; pl011_writeb(uap, c, UART01x_DR); - while (pl011_readw(uap, UART01x_FR) & UART01x_FR_BUSY) + while (pl011_readw(uap, UART01x_FR) & uap->fr_busy) ; } @@ -2210,6 +2274,7 @@ static struct uart_driver amba_reg = { .cons = AMBA_CONSOLE, }; +#ifdef CONFIG_ARM_AMBA static int pl011_probe_dt_alias(int index, struct device *dev) { struct device_node *np; @@ -2274,6 +2339,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) uap->reg_lut = vendor->reg_lut; uap->vendor = vendor; + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->u1_fr_ri = vendor->u1_fr_ri; uap->old_cr = 0; uap->fifosize = vendor->get_fifosize(dev); uap->port.dev = &dev->dev; @@ -2334,6 +2403,101 @@ static int pl011_remove(struct amba_device *dev) uart_unregister_driver(&amba_reg); return 0; } +#endif + +#ifdef CONFIG_SOC_ZX296702 +static int zx_uart_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct uart_amba_port *uap; + struct vendor_data *vendor = &vendor_zx; + struct resource *res; + void __iomem *base; + int i, ret; + + uap = devm_kzalloc(&pdev->dev, sizeof(struct uart_amba_port), + GFP_KERNEL); + if (uap == NULL) { + ret = -ENOMEM; + goto out; + } + + i = of_alias_get_id(np, "serial"); + if (i < 0) { + dev_err(&pdev->dev, "failed to get alias id: %d\n", i); + ret = i; + goto out; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(&pdev->dev, res); + if (!base) { + ret = -ENOMEM; + goto out; + } + + uap->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(uap->clk)) { + ret = PTR_ERR(uap->clk); + goto out; + } + + uap->reg_lut = vendor->reg_lut; + uap->vendor = vendor; + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->u1_fr_ri = vendor->u1_fr_ri; + uap->old_cr = 0; + uap->fifosize = 16; + uap->port.dev = &pdev->dev; + uap->port.mapbase = res->start; + uap->port.membase = base; + uap->port.iotype = UPIO_MEM; + uap->port.irq = platform_get_irq(pdev, 0); + uap->port.fifosize = uap->fifosize; + uap->port.ops = &amba_pl011_pops; + uap->port.flags = UPF_BOOT_AUTOCONF; + uap->port.line = i; + uap->port.uartclk = clk_get_rate(uap->clk); + pl011_dma_probe(&pdev->dev, uap); + + /* Ensure interrupts from this UART are masked and cleared */ + pl011_writew(uap, 0, UART011_IMSC); + pl011_writew(uap, 0xffff, UART011_ICR); + + amba_ports[i] = uap; + + platform_set_drvdata(pdev, uap); + ret = uart_register_driver(&amba_reg); + if (ret < 0) { + pr_err("Failed to register AMBA-PL011 driver\n"); + return ret; + } + ret = uart_add_one_port(&amba_reg, &uap->port); + if (ret) { + amba_ports[i] = NULL; + pl011_dma_remove(uap); + } +out: + return ret; +} + +static int zx_uart_remove(struct platform_device *pdev) +{ + struct uart_amba_port *uap = platform_get_drvdata(pdev); + int i; + + uart_remove_one_port(&amba_reg, &uap->port); + + for (i = 0; i < ARRAY_SIZE(amba_ports); i++) + if (amba_ports[i] == uap) + amba_ports[i] = NULL; + + pl011_dma_remove(uap); + return 0; +} +#endif #ifdef CONFIG_PM_SLEEP static int pl011_suspend(struct device *dev) @@ -2359,6 +2523,7 @@ static int pl011_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(pl011_dev_pm_ops, pl011_suspend, pl011_resume); +#ifdef CONFIG_ARM_AMBA static struct amba_id pl011_ids[] = { { .id = 0x00041011, @@ -2385,16 +2550,48 @@ static struct amba_driver pl011_driver = { .remove = pl011_remove, }; +#endif + +#ifdef CONFIG_SOC_ZX296702 +static const struct of_device_id zx_uart_dt_ids[] = { + { .compatible = "zte,zx296702-uart", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, zx_uart_dt_ids); + +static struct platform_driver zx_uart_driver = { + .driver = { + .name = "zx-uart", + .owner = THIS_MODULE, + .pm = &pl011_dev_pm_ops, + .of_match_table = zx_uart_dt_ids, + }, + .probe = zx_uart_probe, + .remove = zx_uart_remove, +}; +#endif + static int __init pl011_init(void) { printk(KERN_INFO "Serial: AMBA PL011 UART driver\n"); +#ifdef CONFIG_ARM_AMBA return amba_driver_register(&pl011_driver); +#endif + +#ifdef CONFIG_SOC_ZX296702 + return platform_driver_register(&zx_uart_driver); +#endif } static void __exit pl011_exit(void) { +#ifdef CONFIG_ARM_AMBA amba_driver_unregister(&pl011_driver); +#endif +#ifdef CONFIG_SOC_ZX296702 + platform_driver_unregister(&zx_uart_driver); +#endif } /* diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 1fe1549..84f2330 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h @@ -31,6 +31,7 @@ * UART Register Offsets. */ #define UART01x_DR 0x00 /* Data read or written from the interface. */ +#define ZX_UART01x_DR 0x04 /* Data read or written from the interface. */ #define UART01x_RSR 0x04 /* Receive status register (Read). */ #define UART01x_ECR 0x04 /* Error clear register (Write). */ #define UART010_LCRH 0x08 /* Line control register, high byte. */ @@ -39,6 +40,7 @@ #define ST_UART011_TIMEOUT 0x0C /* Timeout period register. */ #define UART010_LCRL 0x10 /* Line control register, low byte. */ #define UART010_CR 0x14 /* Control register. */ +#define ZX_UART01x_FR 0x14 /* Flag register (Read only). */ #define UART01x_FR 0x18 /* Flag register (Read only). */ #define UART010_IIR 0x1C /* Interrupt identification register (Read). */ #define UART010_ICR 0x1C /* Interrupt clear register (Write). */ @@ -50,14 +52,22 @@ #define UART011_LCRH 0x2c /* Line control register. */ #define UART011_LCRH_TX 0x2c /* Line control register. */ #define ST_UART011_LCRH_TX 0x2c /* Tx Line control register. */ +#define ZX_UART011_LCRH_TX 0x30 /* Tx Line control register. */ #define UART011_CR 0x30 /* Control register. */ #define UART011_IFLS 0x34 /* Interrupt fifo level select. */ +#define ZX_UART011_CR 0x34 /* Control register. */ +#define ZX_UART011_IFLS 0x38 /* Interrupt fifo level select. */ #define UART011_IMSC 0x38 /* Interrupt mask. */ #define UART011_RIS 0x3c /* Raw interrupt status. */ +#define ZX_UART011_IMSC 0x40 /* Interrupt mask. */ #define UART011_MIS 0x40 /* Masked interrupt status. */ +#define ZX_UART011_RIS 0x44 /* Raw interrupt status. */ #define UART011_ICR 0x44 /* Interrupt clear register. */ #define UART011_DMACR 0x48 /* DMA control register. */ +#define ZX_UART011_MIS 0x48 /* Masked interrupt status. */ +#define ZX_UART011_ICR 0x4c /* Interrupt clear register. */ #define ST_UART011_XFCR 0x50 /* XON/XOFF control register. */ +#define ZX_UART011_DMACR 0x50 /* DMA control register. */ #define ST_UART011_XON1 0x54 /* XON1 register. */ #define ST_UART011_XON2 0x58 /* XON2 register. */ #define ST_UART011_XOFF1 0x5C /* XON1 register. */ @@ -79,15 +89,19 @@ #define UART011_FR_TXBUSY 0x100 #define UART011_FR_RXBUSY 0x200 +#define ZX_UART01x_FR_BUSY (UART011_FR_RXBUSY | UART011_FR_TXBUSY) #define UART011_FR_RI 0x100 #define UART011_FR_TXFE 0x080 #define UART011_FR_RXFF 0x040 #define UART01x_FR_TXFF 0x020 #define UART01x_FR_RXFE 0x010 #define UART01x_FR_BUSY 0x008 +#define ZX_UART01x_FR_DSR 0x008 #define UART01x_FR_DCD 0x004 #define UART01x_FR_DSR 0x002 +#define ZX_UART01x_FR_CTS 0x002 #define UART01x_FR_CTS 0x001 +#define ZX_UART011_FR_RI 0x001 #define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) #define UART011_CR_CTSEN 0x8000 /* CTS hardware flow control */