From patchwork Wed Sep 19 05:28:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10605269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 720B2112B for ; Wed, 19 Sep 2018 05:31:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F5992BDC7 for ; Wed, 19 Sep 2018 05:31:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 530D72BDD4; Wed, 19 Sep 2018 05:31:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DBC752BE62 for ; Wed, 19 Sep 2018 05:31:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8brfzHgL5/om4mjYDMhXQjHSJOT+mlqAJ7esoHK86Bk=; b=OmYBqAoDvS+9smk+tFbAqd42Ay ldArdYrSsTBTimAxj4cqR2U6ZkhTPk/m4+5vddjf9Yr2Y1cWxoYqbdXojm62SM5K/uRlh9WUpN+nr OB/wUrOtvw7toVFHH1RPOrh5N9BDbfUnAgyLBz2d8S4NgzLj9jKabvmFkG9kUUT5LbG8FA3vk/UPM kQx44LT+PdXvIX/ZkHQ1W5Fuqp8Y8QroDFV5EXx0Uuugjn8IVPDf9vfpKnQ7g7bGGFqF3jqVX1PQg 0klDZPmxl4d6pWdr2wjU/NNhZ+BRgEnolJ+dN3N/LH+1HN+n6j1XFFJMVhUiPjc4Jl4gi+psKwa0q rj410jXQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2V5F-0006JZ-SJ; Wed, 19 Sep 2018 05:31:29 +0000 Received: from conuserg-09.nifty.com ([210.131.2.76]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2V3I-0004GK-3k for linux-arm-kernel@lists.infradead.org; Wed, 19 Sep 2018 05:29:32 +0000 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w8J5Sefa016652; Wed, 19 Sep 2018 14:28:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w8J5Sefa016652 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1537334922; bh=SoZ4skRPOwPfKIZavVmUIpBmfwJ0sH8UkI1n+XllLT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TY83L9Q9kfvV2Z1Tj6xPspxa5jO95bx15wb8D77ogWQxrAy3v3H+Y+3p2fcZsbohv +li3FJCa7Tq5/8UvaZpfUZGoAfYBqtrtixDBOx+6z1GQLlSUXrWXTWdqLd+n1zHxwr 0myHRZikJrJjB6BLTVyV1Eg0LjHWOCbPVUDlYBqN4Is/3WyXJL7EfyqwP9IECqjPE/ pO2aThhTsesPFCa+89EIQWzofiEhPHVlUDG/Hvsu2TqOCa+00o85thkQ3+qr4vs5Ph 0XMxmzD0vpDnA+neaeyGfaivaLAG4PoIbU4KEGCPZvJf/dtp34zS9jCy0ty9HJybsn OAi1TEcL9xW1Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Greg KH , linux-serial@vger.kernel.org Subject: [PATCH 1/3] serial: 8250_uniphier: remove unused "fifo-size" property Date: Wed, 19 Sep 2018 14:28:11 +0900 Message-Id: <1537334893-26079-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537334893-26079-1-git-send-email-yamada.masahiro@socionext.com> References: <1537334893-26079-1-git-send-email-yamada.masahiro@socionext.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180918_222928_519415_1CCB59F5 X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dai Okamura , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Rob Herring , Jiri Slaby , Mark Rutland , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The FIFO size of the UART devices is 64 on almost all UniPhier SoCs with the exception Pro4TV SoC (MN2WS0230), which used 128 FIFO size. However, Pro4TV SoC was never upstreamed, and out of production. So, this property has never been used in a useful way. Let's remove old unused code. Signed-off-by: Masahiro Yamada Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/serial/uniphier-uart.txt | 4 ---- drivers/tty/serial/8250/8250_uniphier.c | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/serial/uniphier-uart.txt b/Documentation/devicetree/bindings/serial/uniphier-uart.txt index 0b3892a..811c479 100644 --- a/Documentation/devicetree/bindings/serial/uniphier-uart.txt +++ b/Documentation/devicetree/bindings/serial/uniphier-uart.txt @@ -6,9 +6,6 @@ Required properties: - interrupts: a single interrupt specifier. - clocks: phandle to the input clock. -Optional properties: -- fifo-size: the RX/TX FIFO size. Defaults to 64 if not specified. - Example: aliases { serial0 = &serial0; @@ -19,5 +16,4 @@ Example: reg = <0x54006800 0x40>; interrupts = <0 33 4>; clocks = <&uart_clk>; - fifo-size = <64>; }; diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c index 28d88ccf..d292654 100644 --- a/drivers/tty/serial/8250/8250_uniphier.c +++ b/drivers/tty/serial/8250/8250_uniphier.c @@ -12,9 +12,6 @@ #include "8250.h" -/* Most (but not all) of UniPhier UART devices have 64-depth FIFO. */ -#define UNIPHIER_UART_DEFAULT_FIFO_SIZE 64 - /* * This hardware is similar to 8250, but its register map is a bit different: * - MMIO32 (regshift = 2) @@ -185,12 +182,6 @@ static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port, port->uartclk = clk_get_rate(priv->clk); - /* Check for fifo size */ - if (of_property_read_u32(np, "fifo-size", &prop) == 0) - port->fifosize = prop; - else - port->fifosize = UNIPHIER_UART_DEFAULT_FIFO_SIZE; - return 0; } @@ -241,6 +232,7 @@ static int uniphier_uart_probe(struct platform_device *pdev) up.port.type = PORT_16550A; up.port.iotype = UPIO_MEM32; + up.port.fifosize = 64; up.port.regshift = UNIPHIER_UART_REGSHIFT; up.port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE; up.capabilities = UART_CAP_FIFO;