From patchwork Thu Mar 25 15:24:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 408991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF50BC433E1 for ; Thu, 25 Mar 2021 15:25:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BABF561A32 for ; Thu, 25 Mar 2021 15:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230113AbhCYPY2 (ORCPT ); Thu, 25 Mar 2021 11:24:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230322AbhCYPYU (ORCPT ); Thu, 25 Mar 2021 11:24:20 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE659C061761 for ; Thu, 25 Mar 2021 08:24:19 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id e18so2688758wrt.6 for ; Thu, 25 Mar 2021 08:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1E9sF10HVEC86a98PFuWKJ9Mp74ZD46Q6KDRkjpEZM4=; b=aEGht26bWiYnI/bWudlTQ+gOMbnqlc8w4EQYhzEYVrx5udt6E6ps2sXMD48X2qbsuN y92CKzFQ9Lfb8SpbMUm3rcp2ThcEH0FaGHeaxY3COdRc4qxVYh2Bm3XOPeNiqikr5qkc uEgrrkIW+YBt/eVRSDBIg3Y/89i1G3WhHly8noKVLeJlcIdUBJ8GVIOE554/CSvgCgLp Wo+iyNx8hQ/b3ZRUsfpWOvuxp4K49Cw/wYZdUP1KbYDm7dWS6ArLmmlvY72HE0kXdMOG xKFKIuv4I1jXPPoNKtLE+0EmWepzGjCa/YkCJ3QCbDNX1Jpp5u1avM3aFMiR9PYO6yO3 gdJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1E9sF10HVEC86a98PFuWKJ9Mp74ZD46Q6KDRkjpEZM4=; b=rgTONQHO/CZLJAdbNJ1Co2zsSfqDs6KsSqZ1rbEtryosoY5TA4yL/LwIG0rvwfqrTx 3MHPauJwx9Uq5phZRy/nu8ZfjN0YXd8GlMOUPmyeWGeOFo9JkS4+pmbN1dikkzwuqsiy q0djriAqOz9Nl1Dan8RaJ+R0KhoT9M8s3+JS+qy8kW05Ku2qtHeGhCQgYMNzEjalOig6 kIGi2+g9LZGe2xcjvkrRnwmICQ0MDpivRVgm8jLO1IM0XliPHw1C3GmI8S5quesEEQGM GaY2BNBhOFYDOYc3oPTCWHWlzFn5CqXrJVYmrf6Gml0+wz9re6jK4g+35GeYeG1esv5K XNhQ== X-Gm-Message-State: AOAM533hyfSAj85/JjSBwt4DObDzeJaKnhEmfzCFOPMrEWS/pgQxnT5B uEqxZPjvEWto+BLN0Cm8OzykUQ== X-Google-Smtp-Source: ABdhPJzqTDL4lVT0INpPHTS+dzfkxTVO9rRKAg7IxpMLVWIsTbtXmKcT+OazzGEAYTUZL1Wj1b51hA== X-Received: by 2002:a5d:4d8d:: with SMTP id b13mr9433139wru.259.1616685858371; Thu, 25 Mar 2021 08:24:18 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:b105:9672:b0a:5820]) by smtp.gmail.com with ESMTPSA id p18sm7395260wrs.68.2021.03.25.08.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 08:24:17 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong , Martin Blumenstingl Subject: [PATCH v2 1/3] dt-bindings: serial: amlogic, meson-uart: add fifo-size property Date: Thu, 25 Mar 2021 16:24:08 +0100 Message-Id: <20210325152410.1795557-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325152410.1795557-1-narmstrong@baylibre.com> References: <20210325152410.1795557-1-narmstrong@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On most of the Amlogic SoCs, the first UART controller in the "Everything-Else" power domain has 128bytes of RX & TX FIFO, so add an optional property to describe a different FIFO size from the other ports (64bytes). Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../devicetree/bindings/serial/amlogic,meson-uart.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml index 75ebc9952a99..8ece7f420c19 100644 --- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml @@ -55,6 +55,12 @@ properties: - const: pclk - const: baud + + fifo-size: + description: The fifo size supported by the UART channel. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [64, 128] + required: - compatible - reg From patchwork Thu Mar 25 15:24:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 408990 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 616E0C433E8 for ; Thu, 25 Mar 2021 15:25:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26AF861A40 for ; Thu, 25 Mar 2021 15:25:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbhCYPYa (ORCPT ); Thu, 25 Mar 2021 11:24:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230416AbhCYPYV (ORCPT ); Thu, 25 Mar 2021 11:24:21 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA30FC06174A for ; Thu, 25 Mar 2021 08:24:20 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id b9so2674264wrt.8 for ; Thu, 25 Mar 2021 08:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sgzzDhp79bx35r5jKOLNYJfzzmoZjTRizxE5UOSMnpw=; b=ZMGw7DOul3+SQoGvgOttwL1Iac5paKrRtV2ymragAJntKtRTzgfrruwJsrw+Ty0lk+ wNgqign0naVJIqRttat6mVH5MB14qMPBfiG/zSOvlLQlHMC5x9s/3bjNyLF8hP7lKj8k Z3ibFMrbX0zZqw7BBDORGwixnLuRZxuE66wrJ/lH2w6N9gjO7O8fDcDuULfZEhEM7D9W 5w2hILsvh9ZpNZWP+PmVtX6683aAJJ20mqWEP8BMaElFMedPPqsUns0zIk8TPmt+989B AHphs+HFybvOfPqVyJs4BSgHYEHhAkeMYyJPxv7Zdq31hhLD5BIEEHTJs2mw/+FlAJBF 7/5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sgzzDhp79bx35r5jKOLNYJfzzmoZjTRizxE5UOSMnpw=; b=UQ9MHKLGP+w9NTBpOti8wy3L+YoKErKJV3HRJAbJav8keq2eS/yrbrpQIEq1rdLsXU YykCERRVp1eJdIF2986XHETZfSGgV6megUXI/kCEfzx6K90T2CVuRzme4GjtO69derXX J38FNMPJKydraTJcYf/ZrJKdybX/Rebb8+oPfUw5S242hQOWkU8l9ZaG9hGutAeDKYqA Gyr/K9VOAqAY3Y2tEbFsV0nPDXZLP9s4FTbF6ROIDSoqM8O2g7sbnWqZTZRrMsixNXXL aHoQpubRBdk+zjgzfUPqI74wWGwf18EAZT08Re3ht1iTfOXnIZPtkWN+97f4sATGQc39 +YKw== X-Gm-Message-State: AOAM530nrVblUUCIB0I36SCNqTZ1cKc9XhRgwZG/ytD3Bu3L/UzZBf+v ib/py9VEv+KTXdApwGcRwDf9SA== X-Google-Smtp-Source: ABdhPJzwib9nqK77IORZQzCGahRNUu/JMVR4TWOE9ehuvIgER+dQxfV5hsZAf8zkflsy93kN7/d/kQ== X-Received: by 2002:a5d:638f:: with SMTP id p15mr9566480wru.220.1616685859525; Thu, 25 Mar 2021 08:24:19 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:b105:9672:b0a:5820]) by smtp.gmail.com with ESMTPSA id p18sm7395260wrs.68.2021.03.25.08.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 08:24:19 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong , Kevin Hilman Subject: [PATCH v2 2/3] tty: serial: meson: retrieve port FIFO size from DT Date: Thu, 25 Mar 2021 16:24:09 +0100 Message-Id: <20210325152410.1795557-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325152410.1795557-1-narmstrong@baylibre.com> References: <20210325152410.1795557-1-narmstrong@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Now the DT bindings has a property to get the FIFO size for a particular port, retrieve it and use to setup the FIFO interrupts threshold. Signed-off-by: Neil Armstrong Reviewed-by: Kevin Hilman Reviewed-by: Martin Blumenstingl --- drivers/tty/serial/meson_uart.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 69eeef9edfa5..ce4dbfb0bd24 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -717,6 +717,7 @@ static int meson_uart_probe(struct platform_device *pdev) { struct resource *res_mem, *res_irq; struct uart_port *port; + u32 fifosize = 64; /* Default is 64, 128 for EE UART_0 */ int ret = 0; int id = -1; @@ -743,6 +744,8 @@ static int meson_uart_probe(struct platform_device *pdev) if (!res_irq) return -ENODEV; + of_property_read_u32(pdev->dev.of_node, "fifo-size", &fifosize); + if (meson_ports[pdev->id]) { dev_err(&pdev->dev, "port %d already allocated\n", pdev->id); return -EBUSY; @@ -772,7 +775,7 @@ static int meson_uart_probe(struct platform_device *pdev) port->type = PORT_MESON; port->x_char = 0; port->ops = &meson_uart_ops; - port->fifosize = 64; + port->fifosize = fifosize; meson_ports[pdev->id] = port; platform_set_drvdata(pdev, port);