From patchwork Wed Feb 1 21:53:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 51582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp533443wrn; Wed, 1 Feb 2023 14:01:01 -0800 (PST) X-Google-Smtp-Source: AK7set+eup/k2vzoNJC9e1wM2nkMSqxK4MjqM5cK4hksXbqghJjuAEisjjL8ssFs3587LDUtcnLK X-Received: by 2002:a17:903:4053:b0:196:7eb6:8b21 with SMTP id n19-20020a170903405300b001967eb68b21mr3496179pla.23.1675288861069; Wed, 01 Feb 2023 14:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675288861; cv=none; d=google.com; s=arc-20160816; b=LKaNUOuM7ZTFIZZD3jKxXNAvZ3IL86qfEZ4ei7+tvCsoacHeWDRZXnGuxiSPx9PBF0 60Ri+RGkVRkwIWXmCD5zEgzp/rAgyGsdqgd17noU1uuDiRhsCtrc6ZHx/Cz4hVyvild2 U0SLuSuX+Ggun8tHS79qe3P5g6aR20JQ3pnY6CCmNQgJ5rFk4GOqGFLHfGgK0sKvshAq 1tSq4O6ceEvZYE/oHMKdb6mrxVEqEy9K/ZOhz/MaOWXpFuKnFcDchUsnLVFEiiAzzKtl j3hhgtfBRk4Ni0s/rsSfB2GHANNMLgNd/PlsFtUPDkX8R2CrHAEa2ffc+Nwy73AbBSIa TJEQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tLp5ZQAmIsso9n6U/cVas1dfVfKmm+HocsrQi1jdGpU=; b=jfgXaQeg0tC/80V2wTYLLImaYE0yyvmQDy8exAeFaw/kR/uRqZXSeqiEHbY5NyRyg8 K9upvv9Vy2aruni6B6XxCQ6VsppF3KPfG4NMEKLgqoYIuRutDCR4Vtgl7QEhyVNWVFzy uFtYJyUuuFIex6bfdv6lNx8nmKA2pAfpeQfK7jBLCK2GuDaknKDzQOsDUslM0KzkHzuP UxKQ3OA10UedimdlAXgHkJtW7uYr8bn6xCLOsqpEj2qQuOvx623zkk8e377uMdwFwoaa yOfntRg0CqfOoe4EQl78j43ukw8yi+w+cnxfr14MT6kCAdqqzXjOMx2V/H7t1txY+KHa 8qxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=U+w3KMMx; 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 t24-20020a170902b21800b00188ef2314b2si19249512plr.79.2023.02.01.14.00.13; Wed, 01 Feb 2023 14:01:01 -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=U+w3KMMx; 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 S231524AbjBAVxc (ORCPT + 99 others); Wed, 1 Feb 2023 16:53:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231465AbjBAVx2 (ORCPT ); Wed, 1 Feb 2023 16:53:28 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 201818680; Wed, 1 Feb 2023 13:53:28 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id h9so11276608plf.9; Wed, 01 Feb 2023 13:53:28 -0800 (PST) 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 :message-id:reply-to; bh=tLp5ZQAmIsso9n6U/cVas1dfVfKmm+HocsrQi1jdGpU=; b=U+w3KMMxuYROKu607z5NG19MS4JmHQ/C+C2opcAdLW98xCmjTjl4aceqX0CjOM6T2h oFyrOv2crppvW+BRotVz3yEZpi2SAwxnhp7GDTn2FQj2wEBVcf/f6rR5sFufviwXqbJZ pJFErase+EmB8IWPW1X7JzXz7xqMb61bmwuN4za1qo0/LysOvuuTYEVQhY9t+k9oagSa 0woC9BwJ4RRQ7RFCc8SrDM9wtkwRmtlmTDk/jwcpfznsYUpxd/GJaG4cgouEqdSN326Z 9ze6kOvxXDPi1omAee89uoFRQEBSRo7XzySgc8tWrYORxf86LKDgAt7ymlEMzqFhxUvW jUvA== 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:message-id:reply-to; bh=tLp5ZQAmIsso9n6U/cVas1dfVfKmm+HocsrQi1jdGpU=; b=rLJNJLFPQF8AP623MFPL7/y8+G03q9UpxjJkS5JvJPBuUeMczG5Cp34JyeEkIUBVqP K5KnT3a+3GaCiypT/BPPXQiW09SSKxtmpatDQD/q1oNhL6lJ47EZzrDuHjIb4DO2lxhc pQgIwd9btOZZWcqHxRSXMs5pkr8/MRZPWYK0qUf/En5LxvdlmSTs6irhjjHmWxEuZRcA Jc8AHSbzpo5FIeE2eR2WNUowQmAZis8YWZcEwz8BBQrjSEe+bhy0EdgWDuNuuKWr8nRX Kg22bVmji2iQQnC5l8YlsUO8RZiA23lt3CXM8gMGixRBGZFP1mbKirdmVcw05OHJ7n8w CYgQ== X-Gm-Message-State: AO0yUKXgu/dSFU8SjIYKX1iLyWQhU/qs3dXlvuQXdZvPM1lBP68GhD8Y Y6bjS50mPZk23e3M+wCGKBU= X-Received: by 2002:a17:90a:ec07:b0:228:f13b:9649 with SMTP id l7-20020a17090aec0700b00228f13b9649mr4035768pjy.43.1675288407417; Wed, 01 Feb 2023 13:53:27 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 13:53:26 -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 2/2] net: fec: do not double-parse 'phy-reset-active-high' property Date: Wed, 1 Feb 2023 13:53:20 -0800 Message-Id: <20230201215320.528319-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230201215320.528319-1-dmitry.torokhov@gmail.com> References: <20230201215320.528319-1-dmitry.torokhov@gmail.com> 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?1756667692890228041?= X-GMAIL-MSGID: =?utf-8?q?1756667692890228041?= Conversion to gpiod API done in commit 468ba54bd616 ("fec: convert to gpio descriptor") clashed with gpiolib applying the same quirk to the reset GPIO polarity (introduced in commit b02c85c9458c). This results in the reset line being left active/device being left in reset state when reset line is "active low". Remove handling of 'phy-reset-active-high' property from the driver and rely on gpiolib to apply needed adjustments to avoid ending up with the double inversion/flipped logic. Fixes: 468ba54bd616 ("fec: convert to gpio descriptor") Signed-off-by: Dmitry Torokhov Reviewed-by: Andrew Lunn --- v3: new patch, split from the original one drivers/net/ethernet/freescale/fec_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 00115b55d0ff..c73e25f8995e 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -4036,7 +4036,6 @@ static int fec_enet_init(struct net_device *ndev) static int fec_reset_phy(struct platform_device *pdev) { struct gpio_desc *phy_reset; - bool active_high = false; int msec = 1, phy_post_delay = 0; struct device_node *np = pdev->dev.of_node; int err; @@ -4054,10 +4053,8 @@ static int fec_reset_phy(struct platform_device *pdev) if (!err && phy_post_delay > 1000) return -EINVAL; - active_high = of_property_read_bool(np, "phy-reset-active-high"); - phy_reset = devm_gpiod_get_optional(&pdev->dev, "phy-reset", - active_high ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); + GPIOD_OUT_HIGH); if (IS_ERR(phy_reset)) return dev_err_probe(&pdev->dev, PTR_ERR(phy_reset), "failed to get phy-reset-gpios\n"); @@ -4070,7 +4067,7 @@ static int fec_reset_phy(struct platform_device *pdev) else usleep_range(msec * 1000, msec * 1000 + 1000); - gpiod_set_value_cansleep(phy_reset, !active_high); + gpiod_set_value_cansleep(phy_reset, 0); if (!phy_post_delay) return 0;