From patchwork Tue Sep 6 20:49:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 12968171 X-Patchwork-Delegate: kuba@kernel.org 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 BB8D0ECAAA1 for ; Tue, 6 Sep 2022 20:49:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230404AbiIFUta (ORCPT ); Tue, 6 Sep 2022 16:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbiIFUt1 (ORCPT ); Tue, 6 Sep 2022 16:49:27 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3DD1E99; Tue, 6 Sep 2022 13:49:25 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id o4so12511916pjp.4; Tue, 06 Sep 2022 13:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=KJYp1zfVvwJHJHkMhxfowkWQ7RAPypxyqcgS+k23cys=; b=qS6qxFg8Q9+sTHY7Kw1qn4myoojesKDAukNzzf1quR0tc3w9XKteaw9cFnj0D2bJth LpZdaxD0mo85T9iDZXEkJWiqnl/FjqMv/HSDLMu3kSkBPltmLKh0F06vmbS4+d7c1PqY mG/HELC/SbxJ/A8O/v10WrVA1r3tJK/JJnm5RjPeCepFuGO7pFRDgFjEBaxsT8bcSXRP uwAgNBgghepPjYvqB/KrK3T8fnC2l8RuxH+JhUjl3xaUZcmdnMAKNBO09L3oIu0XYnzk p/i0+afBw3RlYlZToqKiZ2P+fLegIEq/FKvKAssquLVcXnR3zVKyO+gnrUZOL4XNmWed Ydwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=KJYp1zfVvwJHJHkMhxfowkWQ7RAPypxyqcgS+k23cys=; b=dVU/R0KQdxO0bVuuZnZVHSm8vR9D7e2FPCVIiVFT/knEAksGa7HyzorcoeZnuDuUmB OdTyQ5H0Jvk0hS24/6JYDgImiRWX7vSm05gUOGC9jJOPynPDuhPlezC7mbkj2B20xv8o 51egdynswHKLWwfFCxpWTzt1qYYAPX3CZukMYFKnvTvWvwPJgPLln4R4zY2q2iL6dhg1 ON//9NKxyOdltxlAYIKAL3D54mAGLIGI/AIqmhebIekcn4lCZF3jTvZCdbAPq9uvopKU 6u1DkBxaAavxzJyF+A3xHmHjpa8apI/sDL6uJG2oBxDf0nH4i+YvqdF6YOhsp8/IPLIm VqUQ== X-Gm-Message-State: ACgBeo0GKLJHDNl5RmYz/nus6nqc+xfMZuGJmROojtcFZg6Hcw9JXjkP 1mB0vxqIxW9fBidIYBLVwfw= X-Google-Smtp-Source: AA6agR5C3vks1BNI5tECMMk1F6pNr7y+uvArmo3hAPEaEnUa78DxFdEAYa8wVfo18CtwimaI40D5iA== X-Received: by 2002:a17:902:8d88:b0:175:368a:5e1e with SMTP id v8-20020a1709028d8800b00175368a5e1emr117297plo.5.1662497364927; Tue, 06 Sep 2022 13:49:24 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:202:201:abc4:5d24:5a73:a96b]) by smtp.gmail.com with ESMTPSA id e6-20020a656886000000b00434e2e1a82bsm61664pgt.66.2022.09.06.13.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:49:24 -0700 (PDT) From: Dmitry Torokhov To: "David S. Miller" , Andrew Lunn , Heiner Kallweit Cc: Linus Walleij , Bartosz Golaszewski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] net: davicom: dm9000: switch to using gpiod API Date: Tue, 6 Sep 2022 13:49:20 -0700 Message-Id: <20220906204922.3789922-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This patch switches the driver away from legacy gpio/of_gpio API to gpiod API, and removes use of of_get_named_gpio_flags() which I want to make private to gpiolib. Signed-off-by: Dmitry Torokhov Reviewed-by: Linus Walleij --- drivers/net/ethernet/davicom/dm9000.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 77229e53b04e..c85a6ebd79fc 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -28,8 +28,7 @@ #include #include #include -#include -#include +#include #include #include @@ -1421,8 +1420,7 @@ dm9000_probe(struct platform_device *pdev) int iosize; int i; u32 id_val; - int reset_gpios; - enum of_gpio_flags flags; + struct gpio_desc *reset_gpio; struct regulator *power; bool inv_mac_addr = false; u8 addr[ETH_ALEN]; @@ -1442,20 +1440,24 @@ dm9000_probe(struct platform_device *pdev) dev_dbg(dev, "regulator enabled\n"); } - reset_gpios = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, - &flags); - if (gpio_is_valid(reset_gpios)) { - ret = devm_gpio_request_one(dev, reset_gpios, flags, - "dm9000_reset"); + reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + ret = PTR_ERR_OR_ZERO(reset_gpio); + if (ret) { + dev_err(dev, "failed to request reset gpio: %d\n", ret); + goto out_regulator_disable; + } + + if (reset_gpio) { + ret = gpiod_set_consumer_name(reset_gpio, "dm9000_reset"); if (ret) { - dev_err(dev, "failed to request reset gpio %d: %d\n", - reset_gpios, ret); + dev_err(dev, "failed to set reset gpio name: %d\n", + ret); goto out_regulator_disable; } /* According to manual PWRST# Low Period Min 1ms */ msleep(2); - gpio_set_value(reset_gpios, 1); + gpiod_set_value_cansleep(reset_gpio, 0); /* Needs 3ms to read eeprom when PWRST is deasserted */ msleep(4); } From patchwork Tue Sep 6 20:49:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 12968172 X-Patchwork-Delegate: kuba@kernel.org 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 E6783C54EE9 for ; Tue, 6 Sep 2022 20:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231243AbiIFUtb (ORCPT ); Tue, 6 Sep 2022 16:49:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbiIFUt2 (ORCPT ); Tue, 6 Sep 2022 16:49:28 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDD68F4F; Tue, 6 Sep 2022 13:49:26 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id v5so12446556plo.9; Tue, 06 Sep 2022 13:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=ezx5JxGhsyYC+yP3MEYLgoFlyhvMPcG49uTzbCjAwnc=; b=aWfALvi5zcPKF/wB5z5teeb6d4zqa7DUZdEcSXz5lGS5XcoAapeYwzldvGDu0P/tf7 jabJJFWI32vmzK/WxYMEJ7pzAAFecjis5JlpcIkUplX1J07NfseG+LAFfcdUNPK4+i1m 9u2gp8EATUhokT74/Jf+FefpHOESfV2yb0jBMe0Zc8HIzFU9kMAQY5tTujSmyROs/LK1 sGTEHZYvTUOHSdTJmOEMiLnPEvroBPK8kbLKOEvNerUlHXYqJsHLdOv8PIiVkL1J1sJH SV5NrAygePGoNmQDkIWNZhhH57o7e0LLo5ErlCs0oWbjyMC6CzmF3TPtWCnsD+kRZ1PL +Yhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=ezx5JxGhsyYC+yP3MEYLgoFlyhvMPcG49uTzbCjAwnc=; b=Is4d/wmHMBMmH2cL4hf939n/AGnM7qkZRHijdz5hxcENVWIl10jFgFVLSoO44jJPFF 7VtZbQfJ1XC6UQfmc7HwyJvq7Pvna46KisXq1PvNibkHxnMiNDWPsMiU1nvQ1hv5Jfqn GXSWMejR9KBKWbXjHA+6CUL0bYqV/KUo/0n9nkVI5nXOsnOj/CwMaoTRgElXlam2H7m9 5ead/a8L+ifj4FU96cfvvZYApBPquZi82gbaIZKNiVbP4YB4qk00IelwRwLNitFgBA0Y YdidfvBTLg7ucCgtbtIWgBMkkWPR1+m6L8MVL4Is4COly48kERPlB9LUNr2Pt7E6EMEW Nz5w== X-Gm-Message-State: ACgBeo3OT/I/jjP2fzlepd7EoCWHZ4co3yLKHPMk9r7D1npjDBnWmXPN cu9jNDmpsHHV/t1RCEhR8/Y= X-Google-Smtp-Source: AA6agR4oJt5HM1LY2n980dXQKzU0ApWQ9A116cH4nI3ede1BKIE7s43W35ADcfrm+irY+R6MUDPCwQ== X-Received: by 2002:a17:90a:70cb:b0:200:2849:41b7 with SMTP id a11-20020a17090a70cb00b00200284941b7mr245931pjm.108.1662497365992; Tue, 06 Sep 2022 13:49:25 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:202:201:abc4:5d24:5a73:a96b]) by smtp.gmail.com with ESMTPSA id e6-20020a656886000000b00434e2e1a82bsm61664pgt.66.2022.09.06.13.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:49:25 -0700 (PDT) From: Dmitry Torokhov To: "David S. Miller" , Andrew Lunn , Heiner Kallweit Cc: Linus Walleij , Bartosz Golaszewski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] net: ks8851: switch to using gpiod API Date: Tue, 6 Sep 2022 13:49:21 -0700 Message-Id: <20220906204922.3789922-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220906204922.3789922-1-dmitry.torokhov@gmail.com> References: <20220906204922.3789922-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This patch switches the driver away from legacy gpio/of_gpio API to gpiod API, and removes use of of_get_named_gpio_flags() which I want to make private to gpiolib. Signed-off-by: Dmitry Torokhov Reviewed-by: Linus Walleij --- drivers/net/ethernet/micrel/ks8851.h | 2 +- drivers/net/ethernet/micrel/ks8851_common.c | 40 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h index 6f34a61739b6..fecd43754cea 100644 --- a/drivers/net/ethernet/micrel/ks8851.h +++ b/drivers/net/ethernet/micrel/ks8851.h @@ -403,7 +403,7 @@ struct ks8851_net { struct eeprom_93cx6 eeprom; struct regulator *vdd_reg; struct regulator *vdd_io; - int gpio; + struct gpio_desc *gpio; struct mii_bus *mii_bus; void (*lock)(struct ks8851_net *ks, diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c index ec8457e61b45..cfbc900d4aeb 100644 --- a/drivers/net/ethernet/micrel/ks8851_common.c +++ b/drivers/net/ethernet/micrel/ks8851_common.c @@ -17,10 +17,9 @@ #include #include #include +#include #include -#include -#include #include #include @@ -1117,24 +1116,23 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev, { struct ks8851_net *ks = netdev_priv(netdev); unsigned cider; - int gpio; int ret; ks->netdev = netdev; ks->tx_space = 6144; - gpio = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, NULL); - if (gpio == -EPROBE_DEFER) - return gpio; - - ks->gpio = gpio; - if (gpio_is_valid(gpio)) { - ret = devm_gpio_request_one(dev, gpio, - GPIOF_OUT_INIT_LOW, "ks8851_rst_n"); - if (ret) { - dev_err(dev, "reset gpio request failed\n"); - return ret; - } + ks->gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + ret = PTR_ERR_OR_ZERO(ks->gpio); + if (ret) { + if (ret != -EPROBE_DEFER) + dev_err(dev, "reset gpio request failed: %d\n", ret); + return ret; + } + + ret = gpiod_set_consumer_name(ks->gpio, "ks8851_rst_n"); + if (ret) { + dev_err(dev, "failed to set reset gpio name: %d\n", ret); + return ret; } ks->vdd_io = devm_regulator_get(dev, "vdd-io"); @@ -1161,9 +1159,9 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev, goto err_reg; } - if (gpio_is_valid(gpio)) { + if (ks->gpio) { usleep_range(10000, 11000); - gpio_set_value(gpio, 1); + gpiod_set_value_cansleep(ks->gpio, 0); } spin_lock_init(&ks->statelock); @@ -1239,8 +1237,8 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev, err_id: ks8851_unregister_mdiobus(ks); err_mdio: - if (gpio_is_valid(gpio)) - gpio_set_value(gpio, 0); + if (ks->gpio) + gpiod_set_value_cansleep(ks->gpio, 1); regulator_disable(ks->vdd_reg); err_reg: regulator_disable(ks->vdd_io); @@ -1259,8 +1257,8 @@ void ks8851_remove_common(struct device *dev) dev_info(dev, "remove\n"); unregister_netdev(priv->netdev); - if (gpio_is_valid(priv->gpio)) - gpio_set_value(priv->gpio, 0); + if (priv->gpio) + gpiod_set_value_cansleep(priv->gpio, 1); regulator_disable(priv->vdd_reg); regulator_disable(priv->vdd_io); } From patchwork Tue Sep 6 20:49:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 12968173 X-Patchwork-Delegate: kuba@kernel.org 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 50DE5C38145 for ; Tue, 6 Sep 2022 20:50:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231359AbiIFUuA (ORCPT ); Tue, 6 Sep 2022 16:50:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbiIFUtc (ORCPT ); Tue, 6 Sep 2022 16:49:32 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D71F61115; Tue, 6 Sep 2022 13:49:27 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id a5-20020a17090aa50500b002008eeb040eso3000632pjq.1; Tue, 06 Sep 2022 13:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=sTu5hnPVKKbrS3kjiFxTAtowIT69L16Eo7T0raDDBz8=; b=PjbMcCIvT/98vMSwy7Uft37YfmyFNTwgkXWNFfk8vx9uBlS22i518kxRi0fXoE533o /U8ho5nF8JVcVnIpG0+YfZL928BOE21VIKWYU7Br+z9WktyHydfqTn/9NdE/bglLFo2j J69cYeNWDDBNwS/jVBjY9r/HvAh826HOANJttJcaFXukqLpJjt9RsbFdijbRStG2/+cO fWoRf7bFZjvXXPxVNZCS+YxM7eaN/FvAgp56QS+8jmxwGVevCALLz7ha1eyh2gx7FZ7X qCUY0/nYF6rbbWLoMfTIpU0tjy9O6ucsZ7PTgi1AXgk5vLVNwBe/ktAMXgf+gwLs+WDq ST7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=sTu5hnPVKKbrS3kjiFxTAtowIT69L16Eo7T0raDDBz8=; b=3o1VgGnNgSCoIAUF3kiHdA78XNNiw4B6Q8+8qVNt+DxBKQztWFAPUSM3vOZzHQQa0y mriowDbbvGWvs07oelFHo8MZ+wnYjuhhUE9krD8AdXAsiD7wHzlUpch00uA+EimiYkkM gp5RCU8YWupIjyS/UP8wk+BoJ8QJWi7MJwTDFUe5FdnyFQ+2hyE9zemn7fHA9YQUuPVh SQARZJOLo9v6NtQ9Dwm/UfqREfMv+pryhp6pQQzks6CIcaBigueR24G0+zAKL1Sj8wCs oSqHvv3AfQUlL0X3AXr7/tfOCOLkoxKiHi6n/qNwexWCQZxnecE5dGWGqzqaIJeXnbZW 6x4Q== X-Gm-Message-State: ACgBeo208PhZ99UtEj23eNpN/fu/uTOf0vDgHhZy2bYpJYbhOQ7xuHq5 2yfhxsqlsIkCuDgP14nNnRw= X-Google-Smtp-Source: AA6agR6+VULZsUOMRYNWWPiGqXh6RG1ze3qzfNOU/4KRhldhDUoQ0OSIToeruWkQ9H6MGIzYRfgcCQ== X-Received: by 2002:a17:90b:4d8e:b0:200:73b4:4da2 with SMTP id oj14-20020a17090b4d8e00b0020073b44da2mr11338265pjb.197.1662497367075; Tue, 06 Sep 2022 13:49:27 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:202:201:abc4:5d24:5a73:a96b]) by smtp.gmail.com with ESMTPSA id e6-20020a656886000000b00434e2e1a82bsm61664pgt.66.2022.09.06.13.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:49:26 -0700 (PDT) From: Dmitry Torokhov To: "David S. Miller" , Andrew Lunn , Heiner Kallweit Cc: Linus Walleij , Bartosz Golaszewski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] net: phy: spi_ks8895: switch to using gpiod API Date: Tue, 6 Sep 2022 13:49:22 -0700 Message-Id: <20220906204922.3789922-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220906204922.3789922-1-dmitry.torokhov@gmail.com> References: <20220906204922.3789922-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This patch switches the driver away from legacy gpio/of_gpio API to gpiod API, and removes use of of_get_named_gpio_flags() which I want to make private to gpiolib. Signed-off-by: Dmitry Torokhov Reviewed-by: Linus Walleij --- drivers/net/phy/spi_ks8995.c | 69 ++++++++---------------------------- 1 file changed, 14 insertions(+), 55 deletions(-) diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c index ff37f8ba6758..d4202d40d47a 100644 --- a/drivers/net/phy/spi_ks8995.c +++ b/drivers/net/phy/spi_ks8995.c @@ -17,7 +17,6 @@ #include #include #include -#include #include @@ -137,15 +136,10 @@ static const struct ks8995_chip_params ks8995_chip[] = { }, }; -struct ks8995_pdata { - int reset_gpio; - enum of_gpio_flags reset_gpio_flags; -}; - struct ks8995_switch { struct spi_device *spi; struct mutex lock; - struct ks8995_pdata *pdata; + struct gpio_desc *reset_gpio; struct bin_attribute regs_attr; const struct ks8995_chip_params *chip; int revision_id; @@ -401,24 +395,6 @@ static int ks8995_get_revision(struct ks8995_switch *ks) return err; } -/* ks8995_parse_dt - setup platform data from devicetree - * @ks: pointer to switch instance - * - * Parses supported DT properties and sets up platform data - * accordingly. - */ -static void ks8995_parse_dt(struct ks8995_switch *ks) -{ - struct device_node *np = ks->spi->dev.of_node; - struct ks8995_pdata *pdata = ks->pdata; - - if (!np) - return; - - pdata->reset_gpio = of_get_named_gpio_flags(np, "reset-gpios", 0, - &pdata->reset_gpio_flags); -} - static const struct bin_attribute ks8995_registers_attr = { .attr = { .name = "registers", @@ -449,38 +425,22 @@ static int ks8995_probe(struct spi_device *spi) ks->spi = spi; ks->chip = &ks8995_chip[variant]; - if (ks->spi->dev.of_node) { - ks->pdata = devm_kzalloc(&spi->dev, sizeof(*ks->pdata), - GFP_KERNEL); - if (!ks->pdata) - return -ENOMEM; - - ks->pdata->reset_gpio = -1; - - ks8995_parse_dt(ks); + ks->reset_gpio = devm_gpiod_get_optional(&spi->dev, "reset", + GPIOD_OUT_HIGH); + err = PTR_ERR_OR_ZERO(ks->reset_gpio); + if (err) { + dev_err(&spi->dev, + "failed to get reset gpio: %d\n", err); + return err; } - if (!ks->pdata) - ks->pdata = spi->dev.platform_data; + err = gpiod_set_consumer_name(ks->reset_gpio, "switch-reset"); + if (err) + return err; /* de-assert switch reset */ - if (ks->pdata && gpio_is_valid(ks->pdata->reset_gpio)) { - unsigned long flags; - - flags = (ks->pdata->reset_gpio_flags == OF_GPIO_ACTIVE_LOW ? - GPIOF_ACTIVE_LOW : 0); - - err = devm_gpio_request_one(&spi->dev, - ks->pdata->reset_gpio, - flags, "switch-reset"); - if (err) { - dev_err(&spi->dev, - "failed to get reset-gpios: %d\n", err); - return -EIO; - } - - gpiod_set_value(gpio_to_desc(ks->pdata->reset_gpio), 0); - } + /* FIXME: this likely requires a delay */ + gpiod_set_value_cansleep(ks->reset_gpio, 0); spi_set_drvdata(spi, ks); @@ -524,8 +484,7 @@ static void ks8995_remove(struct spi_device *spi) sysfs_remove_bin_file(&spi->dev.kobj, &ks->regs_attr); /* assert reset */ - if (ks->pdata && gpio_is_valid(ks->pdata->reset_gpio)) - gpiod_set_value(gpio_to_desc(ks->pdata->reset_gpio), 1); + gpiod_set_value_cansleep(ks->reset_gpio, 1); } /* ------------------------------------------------------------------------ */