From patchwork Thu Feb 15 02:17:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 128390 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1249470ljc; Wed, 14 Feb 2018 18:17:47 -0800 (PST) X-Google-Smtp-Source: AH8x224S2e1T5rL68trGxCDkXWl/0tX0Km4yfVPDAX5FXx51jp6ThNBT6Xkc35hYsT/Gk4RWKsnc X-Received: by 2002:a17:902:d68a:: with SMTP id v10-v6mr989013ply.206.1518661067803; Wed, 14 Feb 2018 18:17:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518661067; cv=none; d=google.com; s=arc-20160816; b=bbOyKAgIc1zxLsma4TBQpRsO1+x9jfseRwDJEjiZAQw/Qf87+Pb/5GUX/RkPenGuB7 zWwZfA+fpMikAZZOC1sHKHtmUREeob9aYKslXDVrA4i8LbqjhLi7jSg7ow2Cpnpz7sWG x1A52BY2eYGMTMuC8i8f8PuqLkJQC6Ny2PHp6LY7ggzaBZeuLrZPv88JiL1xzwGH1PDa j4xb4gat/9hI9SWdguh77SMLL79Ur5GS6FgTnrbRJZa/GSIZwKqOW7BqosWmcQVUlH2a WSDQyEWPFY4ZPL/cbXlD5aZDL2wv0YZT25cvm3pxgvIgRVTJGY0rk1WMPFL+4BO4HZBX NePA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=4emC9QqVTRYo8h2iumUpRENcq3/R7mOfFk6CPqheheI=; b=iBPgg4aPwzK+/5PfNKBLPqxM533BP+V65gWhE7n/VWulGpt6K/cGJ41jy1m0z1jRxP nGccpM4t7QL5SGKFEiza0fVNVNSXT/rGfFo90KYrU4VSOcuGCH7YRav8ITtnru599tjK fg5MRKtECRo33AycoGVTqGyaWSlrfXXQeQ8kDcj2XoFsQUEsDloBicL5UeDuE1cgAs/3 n8Ye6dY25dfd/68GXJEZvSReY1/REnlJHAja+4NSoWYRMiWSS7l7Cw7uNd+L5eCyQ5+j kxVHhJjIkkgyb4x116O2KNqM3Iyn9NA0F3Lu3SYaEOc43Tn9rYXqzaEBc4rgOTQgCmPZ ehIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cSULPAjw; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2-v6si531577plh.595.2018.02.14.18.17.47; Wed, 14 Feb 2018 18:17:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cSULPAjw; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032479AbeBOCRq (ORCPT + 6 others); Wed, 14 Feb 2018 21:17:46 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:38929 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032447AbeBOCRp (ORCPT ); Wed, 14 Feb 2018 21:17:45 -0500 Received: by mail-pl0-f68.google.com with SMTP id s13so6030761plq.6; Wed, 14 Feb 2018 18:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=WVMFw1odE++CpOqLgY1xC3Gt/N+U9HxD03CzxPq0dRc=; b=cSULPAjwOkNMMXaZfvzB1KeGo3jXP2kM69DMLkV6oHNwZPjztmCgdNGVRrIO43dQe+ 4ZDfmDQCFlzK1RXRtAScrliBL+LwQOsT/WuUAaD1kSL4ckVPvihW64hPGIQVj+25zz7L nIfOx52zJ+LPumGcJDdjsTmV6QVVZoRQVc14SvYAdKQlexMT6kQQXhQr4bFLi13gv6S1 c83cjPM9CXTY3Twd/w4ebIZtwQfxxIO4zJxXwPw6+iUf/V2pOQd10o3a4x6+hJo4/6jm TOWZUA39NYuvL/N+Ka11qn/z0g6gBAC0URNS4k46yAtPtyHr5S+n5PXh/gZAnFFBtMRj 9uSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=WVMFw1odE++CpOqLgY1xC3Gt/N+U9HxD03CzxPq0dRc=; b=ZevtxSB4JFqHpTjYFUNfMp+MwFOCzmYZmROUN2WPF46RSn9YGBM9WIpG+rcYWW1A7l HGJ+tW8xbxUKz02Nzlgda5leOFkoriZS2eN7JP/8CyeaLbfji9ak494AUy8bP29uEvUT AiRk1Ne3RmmzX37FVRd4lQjDCuIrUIO0mnzB58dcwd5LtG969Qh2me/YXZAskOKLK3HR WfBHm2T+Nnq/Atd8WHt2hn0Bq9kaS5GGncePyuJUcaNYRjkcF2Wz3YsDcQzhos7Ezj0t /iybUZM4QJvqvr+teiXTCmKLWnjekyCDvgNcFL4njm2E4cgoc6EsTJsQkfS9x2LS0UZu AAiA== X-Gm-Message-State: APf1xPCLLvR5zTHwNwtjZRQU/gFt/f1zr1aF7L25GfsebubkLBSVt1iC DP7poBO3U43zaNACQeP2Ad4= X-Received: by 2002:a17:902:bcc7:: with SMTP id o7-v6mr1014770pls.218.1518661063957; Wed, 14 Feb 2018 18:17:43 -0800 (PST) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id v69sm40657643pfi.65.2018.02.14.18.17.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Feb 2018 18:17:43 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Thu, 15 Feb 2018 12:47:34 +1030 From: Joel Stanley To: Greg Kroah-Hartman , Rob Herring , Mark Rutland Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Tomer Maimon , Avi Fishman , Jeremy Kerr Subject: [PATCH v2] serial: 8250: Add Nuvoton NPCM UART Date: Thu, 15 Feb 2018 12:47:20 +1030 Message-Id: <20180215021720.14870-1-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The Nuvoton UART is almost compatible with the 8250 driver when probed via the 8250_of driver, however it requires some extra configuration at startup. Signed-off-by: Joel Stanley --- v2: Remove redundant whitespace Use port number 40 to fill in a gap Documentation/devicetree/bindings/serial/8250.txt | 1 + drivers/tty/serial/8250/8250_of.c | 1 + drivers/tty/serial/8250/8250_port.c | 29 +++++++++++++++++++++++ include/uapi/linux/serial_core.h | 3 +++ include/uapi/linux/serial_reg.h | 5 ++++ 5 files changed, 39 insertions(+) -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/serial/8250.txt b/Documentation/devicetree/bindings/serial/8250.txt index dad3b2ec66d4..aeb6db4e35c3 100644 --- a/Documentation/devicetree/bindings/serial/8250.txt +++ b/Documentation/devicetree/bindings/serial/8250.txt @@ -24,6 +24,7 @@ Required properties: - "ti,da830-uart" - "aspeed,ast2400-vuart" - "aspeed,ast2500-vuart" + - "nuvoton,npcm750-uart" - "serial" if the port type is unknown. - reg : offset and length of the register set for the device. - interrupts : should contain uart interrupt. diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c index 160b8906d9b9..9835b1c1cbe1 100644 --- a/drivers/tty/serial/8250/8250_of.c +++ b/drivers/tty/serial/8250/8250_of.c @@ -316,6 +316,7 @@ static const struct of_device_id of_platform_serial_table[] = { { .compatible = "mrvl,mmp-uart", .data = (void *)PORT_XSCALE, }, { .compatible = "ti,da830-uart", .data = (void *)PORT_DA830, }, + { .compatible = "nuvoton,npcm750-uart", .data = (void *)PORT_NPCM, }, { /* end of list */ }, }; MODULE_DEVICE_TABLE(of, of_platform_serial_table); diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 1328c7e70108..a72222f8b005 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -293,6 +293,15 @@ static const struct serial8250_config uart_config[] = { UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, .flags = UART_CAP_FIFO, }, + [PORT_NPCM] = { + .name = "Nuvoton 16550", + .fifo_size = 16, + .tx_loadsz = 16, + .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 | + UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, + .rxtrig_bytes = {1, 4, 8, 14}, + .flags = UART_CAP_FIFO, + }, }; /* Uart divisor latch read */ @@ -2140,6 +2149,15 @@ int serial8250_do_startup(struct uart_port *port) UART_DA830_PWREMU_MGMT_FREE); } + if (port->type == PORT_NPCM) { + /* + * Nuvoton calls the scratch register 'UART_TOR' (timeout + * register). Enable it, and set TIOC (timeout interrupt + * comparator) to be 0x20 for correct operation. + */ + serial_port_out(port, UART_NPCM_TOR, UART_NPCM_TOIE | 0x20); + } + #ifdef CONFIG_SERIAL_8250_RSA /* * If this is an RSA port, see if we can kick it up to the @@ -2462,6 +2480,15 @@ static unsigned int xr17v35x_get_divisor(struct uart_8250_port *up, return quot_16 >> 4; } +/* Nuvoton NPCM UARTs have a custom divisor calculation */ +static unsigned int npcm_get_divisor(struct uart_8250_port *up, + unsigned int baud) +{ + struct uart_port *port = &up->port; + + return DIV_ROUND_CLOSEST(port->uartclk, 16 * baud + 2) - 2; +} + static unsigned int serial8250_get_divisor(struct uart_8250_port *up, unsigned int baud, unsigned int *frac) @@ -2482,6 +2509,8 @@ static unsigned int serial8250_get_divisor(struct uart_8250_port *up, quot = 0x8002; else if (up->port.type == PORT_XR17V35X) quot = xr17v35x_get_divisor(up, baud, frac); + else if (up->port.type == PORT_NPCM) + quot = npcm_get_divisor(up, baud); else quot = uart_get_divisor(port, baud); diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index 1c8413f93e3d..dce5f9dae121 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h @@ -76,6 +76,9 @@ #define PORT_SUNZILOG 38 #define PORT_SUNSAB 39 +/* Nuvoton UART */ +#define PORT_NPCM 40 + /* Intel EG20 */ #define PORT_PCH_8LINE 44 #define PORT_PCH_2LINE 45 diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h index be07b5470f4b..f82f3c869df9 100644 --- a/include/uapi/linux/serial_reg.h +++ b/include/uapi/linux/serial_reg.h @@ -376,5 +376,10 @@ #define UART_ALTR_EN_TXFIFO_LW 0x01 /* Enable the TX FIFO Low Watermark */ #define UART_ALTR_TX_LOW 0x41 /* Tx FIFO Low Watermark */ + +/* Nuvoton NPCM timeout register */ +#define UART_NPCM_TOR 7 +#define UART_NPCM_TOIE BIT(7) /* Timeout Interrupt Enable */ + #endif /* _LINUX_SERIAL_REG_H */