From patchwork Wed Feb 1 21:53:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 51581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp533327wrn; Wed, 1 Feb 2023 14:00:51 -0800 (PST) X-Google-Smtp-Source: AK7set8tUiDEx2MbTR6Z/V6shdqOMdAqWPSUbKL+5yRJuJEMxhBtL1h6n9OHBPWPhOP4HGcXwXTm X-Received: by 2002:a05:6a21:1586:b0:bc:a96b:c7f7 with SMTP id nr6-20020a056a21158600b000bca96bc7f7mr3523526pzb.9.1675288850624; Wed, 01 Feb 2023 14:00:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675288850; cv=none; d=google.com; s=arc-20160816; b=Pix7qRJEGWY7QagXp/8+SJQWYnaMVOwj324qYGNCpvR8ChakxzJYJ9d3ht5Z99cZua IcgLo7/NJffPBfa7iTwCGp7OOc6g9wapTW3p/VZaKPYyT1QCFltGmJCWLV7SoisUHXk3 KKC4CQ4X7l+b2zCaN2vy6/IYfDXGRby0IHEqVjdWbrbqo+tLNT2bTg5d4bMoh8Xv9vCu tUdRayVNfD3hUcnzqNuGJNrrELsS3FyAzFkHlvupEC9GBSEh0TaRuF743Zeb8U5X+BPf GSWRchgqkDP2NuLYQkgu+a/r36rt42mHKwaqaTbcBcf53l+OY9v1aK8tbJ82Bu2PLPW4 UD0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8zwRSKbGTUujqFIojImH5B73/GPqNmHMeo69BZFjNQ8=; b=tkHxu3GVLkUynL/vEjLH6K9K6XUEb9MYHCZzGoxMXbt0fV+fTo6SBzVzOBkMjc+Q8D O6H6BUc+gp35cGd4MPWR8DGTS/4moJq+jmb6x/8lTgLnmDgqD1gJDoawW1FTDVX6YLx7 dGM2cG+RNomRrpTogwWAxZ8b+o6+b0Ct8Uee4T0zgbDD2I+Kq5r75eRUmPSfpNoVDPrR JOeiUsAvPBeCQCadlzNRkRaEzl3nZbAZxZyJO7ZcbzFjY2qN+QF+6BAIcWTDzIFxwKNo OCl3mffkcTLve1RpRC3pFZ111tWj+ZcOKubBEgR0+4ynUYE4Bo6fMYN3fneNQrebHyrC 6Luw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NqlAFbyX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j24-20020a633c18000000b0046eed3142cesi21139618pga.350.2023.02.01.14.00.04; Wed, 01 Feb 2023 14:00:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NqlAFbyX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231428AbjBAVx2 (ORCPT + 99 others); Wed, 1 Feb 2023 16:53:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjBAVx1 (ORCPT ); Wed, 1 Feb 2023 16:53:27 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 541438680; Wed, 1 Feb 2023 13:53:26 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id o13so90403pjg.2; Wed, 01 Feb 2023 13:53:26 -0800 (PST) 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:message-id:reply-to; bh=8zwRSKbGTUujqFIojImH5B73/GPqNmHMeo69BZFjNQ8=; b=NqlAFbyXSN7RSrD60ELXRot++RoLteUH/WCCWknfvc/Aaqu3A5kwvT2G4f1e66ZCUO lvjk8qsSD0GHeBX45rJf2gFIfLBuN2Zf9tCbkxfNEmGvqS6tPWZcW9w8wWDQ+UnR8+BX DVeHb7IJ8oLGUVhuQqREOLFTvhBJvNms2oOTAsVlre+J+af7fNuDTOJUx3AcdGk8UuaE dmC3uUBdbdY1VpBLWOTTgekDdcd5lAGLIGuW4OCLVNK8ciEgNPwaaf+xPz/ahjUmz2uF NJ3Jr5q7vajsj3nEONQIAeesBOaw5c2zYXRhrwQ84O3Su12ku9cxol3kptpW+FebJvUH H/lw== 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:message-id :reply-to; bh=8zwRSKbGTUujqFIojImH5B73/GPqNmHMeo69BZFjNQ8=; b=cCNkMRqhET0SV9COAXIhSiHqLPgVcREg1+eTWOF/SCi+cCVksYL47ag98yloxOB8PB yasTi6Fg2vWmPBFjvXUwfB/rwS+9MX8cnpzKlrzdBY+SdIwNtcLb6gsINf8+mkXR6lw6 VUtDrbExjYjeVha6YHZzfiKTN1VihvThSElzaQWjmCj4VqKgorBb5Fd25/tNevOnhV5P R0T9KE6RspnpCzNW+s7fz1PTqmbNa1FKlq/kKGpd44P3D/4iBTD3kfTmvuntfWXNbw0+ pYR1B3i5w6686njXS7PAUIqME7Whhbhq226QyTD0saC3ZUSYRmx5ooKrK/G9gC/wXldW Jr7w== X-Gm-Message-State: AO0yUKW1K5v88t8LpgCnyOxw8LivJxoym6wQoVZ/TfKjuVrRMV/QP6pH 3opGTC425eqPeqP9XV1aMmc= X-Received: by 2002:a17:90a:1955:b0:22c:3ce3:29f1 with SMTP id 21-20020a17090a195500b0022c3ce329f1mr3776325pjh.46.1675288405604; Wed, 01 Feb 2023 13:53:25 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:ce3a:44de:62b3:7a4b]) by smtp.gmail.com with ESMTPSA id h15-20020a17090a054f00b002276ba8fb71sm1781957pjf.25.2023.02.01.13.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 13:53:24 -0800 (PST) From: Dmitry Torokhov To: Wei Fang , Jakub Kicinski , Andrew Lunn Cc: Arnd Bergmann , Shenwei Wang , Clark Wang , NXP Linux Team , "David S. Miller" , Eric Dumazet , Paolo Abeni , Marc Kleine-Budde , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] net: fec: restore handling of PHY reset line as optional Date: Wed, 1 Feb 2023 13:53:19 -0800 Message-Id: <20230201215320.528319-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756667681965880469?= X-GMAIL-MSGID: =?utf-8?q?1756667681965880469?= Conversion of the driver to gpiod API done in 468ba54bd616 ("fec: convert to gpio descriptor") incorrectly made reset line mandatory and resulted in aborting driver probe in cases where reset line was not specified (note: this way of specifying PHY reset line is actually deprecated). Switch to using devm_gpiod_get_optional() and skip manipulating reset line if it can not be located. Fixes: 468ba54bd616 ("fec: convert to gpio descriptor") Signed-off-by: Dmitry Torokhov Reviewed-by: Andrew Lunn Reported-by: Marc Kleine-Budde Tested-by: Marc Kleine-Budde Reviewed-by: Arnd Bergmann --- v3: removed handling of 'phy-reset-active-high', it was moved to patch #2 v2: dropped conversion to generic device properties from the patch drivers/net/ethernet/freescale/fec_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 2716898e0b9b..00115b55d0ff 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -4056,12 +4056,15 @@ static int fec_reset_phy(struct platform_device *pdev) active_high = of_property_read_bool(np, "phy-reset-active-high"); - phy_reset = devm_gpiod_get(&pdev->dev, "phy-reset", + phy_reset = devm_gpiod_get_optional(&pdev->dev, "phy-reset", active_high ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); if (IS_ERR(phy_reset)) return dev_err_probe(&pdev->dev, PTR_ERR(phy_reset), "failed to get phy-reset-gpios\n"); + if (!phy_reset) + return 0; + if (msec > 20) msleep(msec); else