From patchwork Tue Mar 30 00:23:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zev Weiss X-Patchwork-Id: 413293 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 0C0A6C433E1 for ; Tue, 30 Mar 2021 00:32:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC364619A6 for ; Tue, 30 Mar 2021 00:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230248AbhC3AcN (ORCPT ); Mon, 29 Mar 2021 20:32:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230212AbhC3Ab7 (ORCPT ); Mon, 29 Mar 2021 20:31:59 -0400 X-Greylist: delayed 459 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 29 Mar 2021 17:31:59 PDT Received: from thorn.bewilderbeest.net (thorn.bewilderbeest.net [IPv6:2605:2700:0:5::4713:9cab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40AE5C061762; Mon, 29 Mar 2021 17:31:59 -0700 (PDT) Received: from hatter.bewilderbeest.net (unknown [IPv6:2600:6c44:7f:ba20::7c6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id 1D52E196; Mon, 29 Mar 2021 17:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1617063875; bh=a68ojvNQDbC+AUZLivBjbDIVsO6PemBG+Kg4ci1snXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RqMybm5NJ4LYIhg26JQHwqz1DqUbeW6JqFIDkVy/f9JY4rOkesBZXpH2elHvtVPwS ScownTse3Njf4e6vksmTwA1+EusamiR6MUBgu/4ambtOYvjDXYKz9WD7Fk8oWItPDJ MTBu7fBKSLQy4SRV3pk7ohlOWnOSfN0knhcL0jOs= From: Zev Weiss To: Joel Stanley Cc: openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, Andrew Jeffery , Zev Weiss , Greg Kroah-Hartman , Jiri Slaby , "Alexander A. Klimov" , Masahiro Yamada , Josh Triplett , linux-serial@vger.kernel.org Subject: [PATCH 1/3] drivers/tty/serial/8250: simplify Aspeed VUART SIRQ polarity DT config Date: Mon, 29 Mar 2021 19:23:36 -0500 Message-Id: <20210330002338.335-2-zev@bewilderbeest.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210330002338.335-1-zev@bewilderbeest.net> References: <20210330002338.335-1-zev@bewilderbeest.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The initial implementation of this configuration conflated the SIRQ polarity setting with the syscon eSPI/LPC strapping; this patch disentangles them by reducing the DT config to a simple boolean. Signed-off-by: Zev Weiss --- drivers/tty/serial/8250/8250_aspeed_vuart.c | 39 ++------------------- drivers/tty/serial/8250/Kconfig | 1 - 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c b/drivers/tty/serial/8250/8250_aspeed_vuart.c index c33e02cbde93..b9b5fa58ab28 100644 --- a/drivers/tty/serial/8250/8250_aspeed_vuart.c +++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c @@ -10,8 +10,6 @@ #include #include #include -#include -#include #include #include #include @@ -346,30 +344,8 @@ static int aspeed_vuart_handle_irq(struct uart_port *port) return 1; } -static void aspeed_vuart_auto_configure_sirq_polarity( - struct aspeed_vuart *vuart, struct device_node *syscon_np, - u32 reg_offset, u32 reg_mask) -{ - struct regmap *regmap; - u32 value; - - regmap = syscon_node_to_regmap(syscon_np); - if (IS_ERR(regmap)) { - dev_warn(vuart->dev, - "could not get regmap for aspeed,sirq-polarity-sense\n"); - return; - } - if (regmap_read(regmap, reg_offset, &value)) { - dev_warn(vuart->dev, "could not read hw strap table\n"); - return; - } - - aspeed_vuart_set_sirq_polarity(vuart, (value & reg_mask) == 0); -} - static int aspeed_vuart_probe(struct platform_device *pdev) { - struct of_phandle_args sirq_polarity_sense_args; struct uart_8250_port port; struct aspeed_vuart *vuart; struct device_node *np; @@ -468,19 +444,8 @@ static int aspeed_vuart_probe(struct platform_device *pdev) vuart->line = rc; - rc = of_parse_phandle_with_fixed_args( - np, "aspeed,sirq-polarity-sense", 2, 0, - &sirq_polarity_sense_args); - if (rc < 0) { - dev_dbg(&pdev->dev, - "aspeed,sirq-polarity-sense property not found\n"); - } else { - aspeed_vuart_auto_configure_sirq_polarity( - vuart, sirq_polarity_sense_args.np, - sirq_polarity_sense_args.args[0], - BIT(sirq_polarity_sense_args.args[1])); - of_node_put(sirq_polarity_sense_args.np); - } + if (of_property_read_bool(np, "aspeed,sirq-active-high")) + aspeed_vuart_set_sirq_polarity(vuart, 1); aspeed_vuart_set_enabled(vuart, true); aspeed_vuart_set_host_tx_discard(vuart, true); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 603137da4736..105a325bcdd1 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -254,7 +254,6 @@ config SERIAL_8250_ASPEED_VUART tristate "Aspeed Virtual UART" depends on SERIAL_8250 depends on OF - depends on REGMAP && MFD_SYSCON help If you want to use the virtual UART (VUART) device on Aspeed BMC platforms, enable this option. This enables the 16550A- From patchwork Tue Mar 30 00:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zev Weiss X-Patchwork-Id: 412185 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 5EECEC433C1 for ; Tue, 30 Mar 2021 00:32:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AE0D61987 for ; Tue, 30 Mar 2021 00:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbhC3AcN (ORCPT ); Mon, 29 Mar 2021 20:32:13 -0400 Received: from thorn.bewilderbeest.net ([71.19.156.171]:38343 "EHLO thorn.bewilderbeest.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbhC3Ab7 (ORCPT ); Mon, 29 Mar 2021 20:31:59 -0400 X-Greylist: delayed 424 seconds by postgrey-1.27 at vger.kernel.org; Mon, 29 Mar 2021 20:31:59 EDT Received: from hatter.bewilderbeest.net (unknown [IPv6:2600:6c44:7f:ba20::7c6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id CDBB3373; Mon, 29 Mar 2021 17:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1617063894; bh=/9ihArs2Y5nqE6CHv1WmVwDQQrPL9NzAFux7u/c08ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OOrxlajmImZXKgUN3fi/ETblSJLGwuBqdMn1HtNxikoj8n19rQG/xf+Hboe3gORv4 KuW1Twxqb3ZHyaUBeu9RDLXzrsncDXXqiP7d/1pwO+TyPcrALgnmc+NZf61eCKYm1i 3HjgiNvg0r9a0MWJM1/a0VyQqd35yBa/0AxhcEzc= From: Zev Weiss To: Joel Stanley Cc: openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, Andrew Jeffery , Zev Weiss , Greg Kroah-Hartman , Rob Herring , Lubomir Rintel , - , linux-serial@vger.kernel.org Subject: [PATCH 2/3] dt-bindings: serial: 8250: update for aspeed, sirq-active-high Date: Mon, 29 Mar 2021 19:23:37 -0500 Message-Id: <20210330002338.335-3-zev@bewilderbeest.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210330002338.335-1-zev@bewilderbeest.net> References: <20210330002338.335-1-zev@bewilderbeest.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Update DT bindings documentation for the new incarnation of the aspeed,sirq-polarity-sense property. Signed-off-by: Zev Weiss --- Documentation/devicetree/bindings/serial/8250.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/serial/8250.yaml b/Documentation/devicetree/bindings/serial/8250.yaml index f54cae9ff7b2..0bbb7121f720 100644 --- a/Documentation/devicetree/bindings/serial/8250.yaml +++ b/Documentation/devicetree/bindings/serial/8250.yaml @@ -13,7 +13,7 @@ allOf: - $ref: /schemas/serial.yaml# - if: required: - - aspeed,sirq-polarity-sense + - aspeed,sirq-active-high then: properties: compatible: @@ -181,13 +181,11 @@ properties: rng-gpios: true dcd-gpios: true - aspeed,sirq-polarity-sense: - $ref: /schemas/types.yaml#/definitions/phandle-array + aspeed,sirq-active-high: + type: boolean description: | - Phandle to aspeed,ast2500-scu compatible syscon alongside register - offset and bit number to identify how the SIRQ polarity should be - configured. One possible data source is the LPC/eSPI mode bit. Only - applicable to aspeed,ast2500-vuart. + Set to indicate that the SIRQ polarity is active-high (default + is active-low). Only applicable to aspeed,ast2500-vuart. required: - reg @@ -227,7 +225,7 @@ examples: interrupts = <8>; clocks = <&syscon ASPEED_CLK_APB>; no-loopback-test; - aspeed,sirq-polarity-sense = <&syscon 0x70 25>; + aspeed,sirq-active-high; }; ...