Message ID | 20230130151612.212732-128-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=L5gGWJ0M; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bw628Ksz23hg for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:30:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A695985A3B; Mon, 30 Jan 2023 16:24:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="L5gGWJ0M"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8226D85943; Mon, 30 Jan 2023 16:19:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4E93E85988 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:18:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id m8so5217974ili.7 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:18:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=EQpsNAsuRNnPguoPBGnEKcFYT6WTFkEhzyP6tkwom08=; b=L5gGWJ0MmRj/I1XzpcTO293lwsVrDjJ/DTcrlfpdhmRB5W5h7vMZ4ezReQf7euthk3 bs7sXNF7UGIRiL08fQsv3jq/c7C603Wfzi/XWLWHldebGvhR1Yffd8IUjdptEQqFOGOJ zXpRZyNrOTLgXVBN8TvW0Uhq4+2JAOdpehKAc= 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=EQpsNAsuRNnPguoPBGnEKcFYT6WTFkEhzyP6tkwom08=; b=ductVdBU7F2KkErrb2iPgeQj8BcHjLehYRVyI3jkmMIyU/R1JGx7Tz15o+t+Owt/Nz 2kJqvWjAaGwYLHSL9AiR4RnBlGu8LOH2iUY/7u3538wutBjWTMwsYvxz7NtML9ngeUyd dWzjeLKyGMgQZJbaDp777eopKeNvMmEQrhhKoB5gK2E51klMJhuwMeXiSPHoSmO9GPcl Zaj6NK3O4LkO1M3voPFy8XZyUTXHGUfNzBNjFMJsxOhxOmhX8yHztAoUj0nqU9k65G4m LXoEND22QWC/PCLQEMB26/ciH/pd3wKzTrXTAH+UZfD1VQE02VmL38t4B+c4An19PC8D 5mJA== X-Gm-Message-State: AO0yUKX5bCL9uWDVPISgeaD3XYaNQ3i27s3BCam8hHJkyTxZ7Y0h9TQn 5xqyp8+MagiYDamuOj7fk+EmtrBzhlIhIJ/b X-Google-Smtp-Source: AK7set/bWYyRcS6xfgdHMEKV6CMEm+sqxTTyT86wK9hho5e+x+y2NxdxOvedfYbO27dH/QnpmZa4NA== X-Received: by 2002:a05:6e02:198c:b0:310:d384:df25 with SMTP id g12-20020a056e02198c00b00310d384df25mr9018955ilf.5.1675091862010; Mon, 30 Jan 2023 07:17:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:41 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com>, Ramon Fried <rfried.dev@gmail.com> Subject: [PATCH 127/171] Correct SPL uses of PHY_FIXED Date: Mon, 30 Jan 2023 08:15:28 -0700 Message-Id: <20230130151612.212732-128-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d45..24933473fa0 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -815,7 +815,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp) mvreg_write(pp, MVNETA_SDMA_CONFIG, val); /* Enable PHY polling in hardware if not in fixed-link mode */ - if (!CONFIG_IS_ENABLED(PHY_FIXED) || + if (!IS_ENABLED(CONFIG_PHY_FIXED) || pp->phydev->phy_id != PHY_FIXED_ID) { mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr); @@ -1176,7 +1176,7 @@ static void mvneta_adjust_link(struct udevice *dev) * be added). Also, why is ADVERT_FC enabled if we don't enable * inband AN at all? */ - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && pp->phydev->phy_id == PHY_FIXED_ID) val = MVNETA_GMAC_IB_BYPASS_AN_EN | MVNETA_GMAC_SET_FC_EN | diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 4401492ca01..989ab3e4c96 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -171,7 +171,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev, struct phy_device *phy; ofnode phynode; - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) { phy = phy_connect(NULL, 0, ethdev, interface); goto out;
This converts 3 usages of this option to the non-SPL form, since there is no SPL_PHY_FIXED defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/net/mvneta.c | 4 ++-- net/mdio-uclass.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)