From patchwork Thu Dec 18 08:33:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RWRkaWUgSHVhbmcgKOm7g+aZuuWCkSk=?= X-Patchwork-Id: 5511531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F1E399F326 for ; Thu, 18 Dec 2014 08:36:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 263BA209EA for ; Thu, 18 Dec 2014 08:36:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4DF32209B5 for ; Thu, 18 Dec 2014 08:36:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y1WXu-0004TE-JO; Thu, 18 Dec 2014 08:34:54 +0000 Received: from [210.61.82.184] (helo=mailgw02.mediatek.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y1WXS-0003sz-Ol for linux-arm-kernel@lists.infradead.org; Thu, 18 Dec 2014 08:34:28 +0000 X-Listener-Flag: 11101 Received: from mtkhts09.mediatek.inc [(172.21.101.70)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1868291315; Thu, 18 Dec 2014 16:33:54 +0800 Received: from mtkslt208.mediatek.inc (10.21.15.95) by mtkhts09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.181.6; Thu, 18 Dec 2014 16:33:53 +0800 From: Eddie Huang To: Mark Rutland , Greg Kroah-Hartman , Matthias Brugger Subject: [PATCH 1/2] tty: serial: 8250_mtk: Add earlycon Date: Thu, 18 Dec 2014 16:33:20 +0800 Message-ID: <1418891601-53769-2-git-send-email-eddie.huang@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1418891601-53769-1-git-send-email-eddie.huang@mediatek.com> References: <1418891601-53769-1-git-send-email-eddie.huang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141218_003427_089877_71013AF7 X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.3 (+) Cc: devicetree@vger.kernel.org, srv_heupstream@mediatek.com, Pawel Moll , Ian Campbell , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, yh.chen@mediatek.com, Rob Herring , linux-serial@vger.kernel.org, Kumar Gala , yingjoe.chen@mediatek.com, Eddie Huang , Jiri Slaby , Sascha Hauer , linux-arm-kernel@lists.infradead.org, Alan Cox X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Mediatek UART has highspeed register, but 8250_early.c doesn't support this, so add earlycon in 8250_mtk.c Signed-off-by: Eddie Huang --- drivers/tty/serial/8250/8250_mtk.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index de7aae5..65dd569 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "8250.h" @@ -289,6 +290,38 @@ static struct platform_driver mtk8250_platform_driver = { }; module_platform_driver(mtk8250_platform_driver); +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +static void __init mtk8250_serial_putc(struct uart_port *port, int c) +{ + while ((readl(port->membase + (UART_LSR << 2)) & BOTH_EMPTY) != + BOTH_EMPTY) + ; + writel(c, port->membase + (UART_TX << 2)); +} + +static void __init early_mtk8250_write(struct console *console, + const char *s, unsigned int count) +{ + struct earlycon_device *dev = console->data; + + uart_console_write(&dev->port, s, count, mtk8250_serial_putc); +} + +static int __init early_mtk8250_setup(struct earlycon_device *device, + const char *options) +{ + if (!device->port.membase) + return -ENODEV; + + device->con->write = early_mtk8250_write; + + return 0; +} + +EARLYCON_DECLARE(mtk8250, early_mtk8250_setup); +OF_EARLYCON_DECLARE(mtk8250, "mediatek,mt6577-uart", early_mtk8250_setup); + MODULE_AUTHOR("Matthias Brugger"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Mediatek 8250 serial port driver");