From patchwork Wed Dec 15 03:05:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Mosberger-Tang X-Patchwork-Id: 12677311 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05530C4332F for ; Wed, 15 Dec 2021 03:05:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239505AbhLODFO (ORCPT ); Tue, 14 Dec 2021 22:05:14 -0500 Received: from o1.ptr2625.egauge.net ([167.89.112.53]:27702 "EHLO o1.ptr2625.egauge.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239482AbhLODFM (ORCPT ); Tue, 14 Dec 2021 22:05:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=egauge.net; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type; s=sgd; bh=YKirxG6CHpVK3733gG5FZmHPmsrKUthxnkRneucGCgw=; b=i31Zddfj/ew7cYK/SpBDKMtKWu0Ot6+9qavAOWkE5kRlEsDDtkla/aHICd4ysEt78zHe kbIoVp6Vysv1WRpTi4ZxHj/grfy/uJsdnGeiKB5JF8q6p6nzC/ndMFtS1yUdrL+vPIreEM QrTMTzXgk0skhaoks3ozpGUjD8LLuzxklY3oKxf9uZcc0MVS/pImR3zWI3P9U1tCZilSOy k170Na+3Q06/L6L7C1HbOT3rpR98teqBDOo2NOsKkzTaerLclRCwDpT8jBI1JkNJG0YvTI eNA8R16F5Dykyqg1wnGUjr2YYNaXFdi1YSnfNUGBg11YbAjk1zkS1gvlQed9NLBQ== Received: by filterdrecv-64fcb979b9-x2652 with SMTP id filterdrecv-64fcb979b9-x2652-1-61B95B67-46 2021-12-15 03:05:11.419056373 +0000 UTC m=+7960104.103383879 Received: from pearl.egauge.net (unknown) by geopod-ismtpd-4-0 (SG) with ESMTP id SyoqX26tSbWoqrqmrl5D5A Wed, 15 Dec 2021 03:05:11.242 +0000 (UTC) Received: by pearl.egauge.net (Postfix, from userid 1000) id DF024700269; Tue, 14 Dec 2021 20:05:10 -0700 (MST) From: David Mosberger-Tang Subject: [PATCH v5 1/2] wilc1000: Add reset/enable GPIO support to SPI driver Date: Wed, 15 Dec 2021 03:05:11 +0000 (UTC) Message-Id: <20211215030501.3779911-2-davidm@egauge.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211215030501.3779911-1-davidm@egauge.net> References: <20211215030501.3779911-1-davidm@egauge.net> MIME-Version: 1.0 X-SG-EID: +kMxBqj35EdRUKoy8diX1j4AXmPtd302oan+iXZuF8m2Nw4HRW2irNspffT/khET6RJF6+Prbl0h/EtF1rRLvEDTbjozybIQW7apgv8TFu2TByFR6kyoREEXxJDx1n9/ob0J/vVAByA/coszakLv7NG3knfPnGjVZnUywcdsAr3dtaznjaaOZQ5kfmWM+/YXZz2hifGys2BwxCMGCtrYhvF1cQyY60gtV/Oou3kZzwuvCfyH6IoqDgLRb8BVjNHF6LGHsNEnUneyk+BrLVQnXA== To: Ajay Singh Cc: Adham Abozaeid , Claudiu Beznea , "David S. Miller" , devicetree@vger.kernel.org, Jakub Kicinski , Kalle Valo , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Rob Herring , David Mosberger-Tang X-Entity-ID: Xg4JGAcGrJFIz2kDG9eoaQ== Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org For the SDIO driver, the RESET/ENABLE pins of WILC1000 are controlled through the SDIO power sequence driver. This commit adds analogous support for the SPI driver. Specifically, during initialization, the chip will be ENABLEd and taken out of RESET and during deinitialization, the chip will be placed back into RESET and disabled (both to reduce power consumption and to ensure the WiFi radio is off). Both RESET and ENABLE GPIOs are optional. However, if the ENABLE GPIO is specified, then the RESET GPIO should normally also be specified as otherwise there is no way to ensure proper timing of the ENABLE/RESET sequence. Signed-off-by: David Mosberger-Tang --- drivers/net/wireless/microchip/wilc1000/spi.c | 58 ++++++++++++++++++- .../net/wireless/microchip/wilc1000/wlan.c | 2 +- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c index 6e7fd18c14e7..0b4425e56bfa 100644 --- a/drivers/net/wireless/microchip/wilc1000/spi.c +++ b/drivers/net/wireless/microchip/wilc1000/spi.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "netdev.h" #include "cfg80211.h" @@ -43,6 +44,10 @@ struct wilc_spi { bool probing_crc; /* true if we're probing chip's CRC config */ bool crc7_enabled; /* true if crc7 is currently enabled */ bool crc16_enabled; /* true if crc16 is currently enabled */ + struct wilc_gpios { + struct gpio_desc *enable; /* ENABLE GPIO or NULL */ + struct gpio_desc *reset; /* RESET GPIO or NULL */ + } gpios; }; static const struct wilc_hif_func wilc_hif_spi; @@ -152,6 +157,46 @@ struct wilc_spi_special_cmd_rsp { u8 status; } __packed; +static int wilc_parse_gpios(struct wilc *wilc) +{ + struct spi_device *spi = to_spi_device(wilc->dev); + struct wilc_spi *spi_priv = wilc->bus_data; + struct wilc_gpios *gpios = &spi_priv->gpios; + + /* get ENABLE pin and deassert it (if it is defined): */ + gpios->enable = devm_gpiod_get_optional(&spi->dev, + "enable", GPIOD_OUT_LOW); + /* get RESET pin and assert it (if it is defined): */ + if (gpios->enable) { + /* if enable pin exists, reset must exist as well */ + gpios->reset = devm_gpiod_get(&spi->dev, + "reset", GPIOD_OUT_HIGH); + if (IS_ERR(gpios->reset)) { + dev_err(&spi->dev, "missing reset gpio.\n"); + return PTR_ERR(gpios->reset); + } + } else { + gpios->reset = devm_gpiod_get_optional(&spi->dev, + "reset", GPIOD_OUT_HIGH); + } + return 0; +} + +static void wilc_wlan_power(struct wilc *wilc, bool on) +{ + struct wilc_spi *spi_priv = wilc->bus_data; + struct wilc_gpios *gpios = &spi_priv->gpios; + + if (on) { + gpiod_set_value(gpios->enable, 1); /* assert ENABLE */ + mdelay(5); + gpiod_set_value(gpios->reset, 0); /* deassert RESET */ + } else { + gpiod_set_value(gpios->reset, 1); /* assert RESET */ + gpiod_set_value(gpios->enable, 0); /* deassert ENABLE */ + } +} + static int wilc_bus_probe(struct spi_device *spi) { int ret; @@ -171,6 +216,10 @@ static int wilc_bus_probe(struct spi_device *spi) wilc->bus_data = spi_priv; wilc->dev_irq_num = spi->irq; + ret = wilc_parse_gpios(wilc); + if (ret < 0) + goto netdev_cleanup; + wilc->rtc_clk = devm_clk_get_optional(&spi->dev, "rtc"); if (IS_ERR(wilc->rtc_clk)) { ret = PTR_ERR(wilc->rtc_clk); @@ -984,9 +1033,10 @@ static int wilc_spi_reset(struct wilc *wilc) static int wilc_spi_deinit(struct wilc *wilc) { - /* - * TODO: - */ + struct wilc_spi *spi_priv = wilc->bus_data; + + spi_priv->isinit = false; + wilc_wlan_power(wilc, false); return 0; } @@ -1007,6 +1057,8 @@ static int wilc_spi_init(struct wilc *wilc, bool resume) dev_err(&spi->dev, "Fail cmd read chip id...\n"); } + wilc_wlan_power(wilc, true); + /* * configure protocol */ diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index 82566544419a..f1e4ac3a2ad5 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -1253,7 +1253,7 @@ void wilc_wlan_cleanup(struct net_device *dev) wilc->rx_buffer = NULL; kfree(wilc->tx_buffer); wilc->tx_buffer = NULL; - wilc->hif_func->hif_deinit(NULL); + wilc->hif_func->hif_deinit(wilc); } static int wilc_wlan_cfg_commit(struct wilc_vif *vif, int type, From patchwork Wed Dec 15 03:05:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Mosberger-Tang X-Patchwork-Id: 12677309 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38D42C433F5 for ; Wed, 15 Dec 2021 03:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239484AbhLODFP (ORCPT ); Tue, 14 Dec 2021 22:05:15 -0500 Received: from o1.ptr2625.egauge.net ([167.89.112.53]:27962 "EHLO o1.ptr2625.egauge.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239492AbhLODFO (ORCPT ); Tue, 14 Dec 2021 22:05:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=egauge.net; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type; s=sgd; bh=n5E/dGiaWc093mMx2isrqIl9xS2diTFoldK85pjdP9U=; b=EnnqmqN3JxQA/cuMBO7tEt/6PLEiAcHUzEIqxbueNbdf8uVAGJFD4tpOtBTZgw6oMHvo 9kOJL4Ont7VUb9rcPeflwFOSlMTtAPDPZrvwBDMs8rMjxzHGogJZIWOFhUWd332ujx1luU kEBOy4gOS5mqJOMAdXpOzoBCUeOum71HVvXvKvuOa3I6AUd4hGOpJGy0Rr7+c/crc/P1ci 5cuZYa/pJRHUT7uxylL/BPAJJCPZNHo8SX9Thut5Ed2xBL2h1PZQ2P5uznoL9C55UvbNdb DZMcJWB2fTnomHOq+iPNzgXHEeST5YNqb5wmufg4q/PBa7IiVZHX2YOj25WRsNDw== Received: by filterdrecv-656998cfdd-bkftm with SMTP id filterdrecv-656998cfdd-bkftm-1-61B95B67-94 2021-12-15 03:05:12.007490305 +0000 UTC m=+7270674.434639005 Received: from pearl.egauge.net (unknown) by geopod-ismtpd-6-0 (SG) with ESMTP id uY3a5_yrR9G7jgcsBnOj4g Wed, 15 Dec 2021 03:05:11.797 +0000 (UTC) Received: by pearl.egauge.net (Postfix, from userid 1000) id 79A74700269; Tue, 14 Dec 2021 20:05:11 -0700 (MST) From: David Mosberger-Tang Subject: [PATCH v5 2/2] wilc1000: Document enable-gpios and reset-gpios properties Date: Wed, 15 Dec 2021 03:05:12 +0000 (UTC) Message-Id: <20211215030501.3779911-3-davidm@egauge.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211215030501.3779911-1-davidm@egauge.net> References: <20211215030501.3779911-1-davidm@egauge.net> MIME-Version: 1.0 X-SG-EID: +kMxBqj35EdRUKoy8diX1j4AXmPtd302oan+iXZuF8m2Nw4HRW2irNspffT/khET6RJF6+Prbl0h/EtF1rRLvAJX2hjXqlZEyi4OXrLApbyobOaAcwna02jHMyQlXVEb6oBIx1uTmA4c4pTGtpKVJWiWyGwTcEunqp1kxe2wSQu1kbNHQlM/DiUkVSrYAyVmWstIj7U+Q6W3hUQS43avFtiwgC+mSBbR/AzxB2P2bjE+M9O1DB4o4g7Hn4BbfajgAWI9iFaBznXz1sMhZhnFcg== To: Ajay Singh Cc: Adham Abozaeid , Claudiu Beznea , "David S. Miller" , devicetree@vger.kernel.org, Jakub Kicinski , Kalle Valo , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Rob Herring , David Mosberger-Tang X-Entity-ID: Xg4JGAcGrJFIz2kDG9eoaQ== Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add documentation for the ENABLE and RESET GPIOs that may be needed by wilc1000-spi. Signed-off-by: David Mosberger-Tang Reviewed-by: Rob Herring --- .../net/wireless/microchip,wilc1000.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Documentation/devicetree/bindings/net/wireless/microchip,wilc1000.yaml b/Documentation/devicetree/bindings/net/wireless/microchip,wilc1000.yaml index 6c35682377e6..60de78f1bc7b 100644 --- a/Documentation/devicetree/bindings/net/wireless/microchip,wilc1000.yaml +++ b/Documentation/devicetree/bindings/net/wireless/microchip,wilc1000.yaml @@ -32,6 +32,21 @@ properties: clock-names: const: rtc + enable-gpios: + maxItems: 1 + description: Used by wilc1000-spi to determine the GPIO line + connected to the ENABLE line. If specified, reset-gpios + must be specified as well as otherwise the driver cannot + ensure the timing required between asserting ENABLE + and deasserting RESET. This should be declared as an + active-high signal. + + reset-gpios: + maxItems: 1 + description: Used by wilc1000-spi to determine the GPIO line + connected to the RESET line. This should be declared as an + active-low signal. + required: - compatible - interrupts @@ -40,6 +55,8 @@ additionalProperties: false examples: - | + #include + spi { #address-cells = <1>; #size-cells = <0>; @@ -51,6 +68,8 @@ examples: interrupts = <27 0>; clocks = <&pck1>; clock-names = "rtc"; + enable-gpios = <&pioA 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pioA 6 GPIO_ACTIVE_LOW>; }; };