From patchwork Mon May 9 07:48:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12843102 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E0AAC433F5 for ; Mon, 9 May 2022 07:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=miYM4U5wZJQG4dcGXv6Q55w0F64wYAlogOgY+INvEuw=; b=3bDvm8AyABmnNH kkuFd78W1QjvzRJrL5aCvkQbfWr/R4jsbsk/4wA2IZHctfH/xVQ3CBMWtTBxbeL8O/XoLeTwVEqVR V+2sZ05DIRRB7Mc+D5eoeV1COVTh8533GkLgMKusbey/q/E817Yj8LhP8ocIqswbHpVwTevThNK0s 2psjlbtvCUGe9McIadgoLk61fcSMRDHCHAts2V+YOhoYM23FtsW0OvSSqjU8t9I/f1Ah3duJOzoIv L2FqZWer2NnVCN8Rr1Kq19DoFihvmT8gNvE9oMkg0dEehDLu7CkRTh84kD7eQWtkPY7ccQzBA0abQ e+Rl8Gp7qT67xhVDaNSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8q-00CxX8-3d; Mon, 09 May 2022 07:49:16 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8k-00CxTH-9g for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 07:49:13 +0000 Received: by mail-wr1-x429.google.com with SMTP id t6so18190496wra.4 for ; Mon, 09 May 2022 00:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0WOritaX7TiJ2UopsHt1F9UHI9/f6Pz6lo2giHHHHfc=; b=vLRuZyi6JG45t+95C6Zta3+FYr+M/sDzl2IdgVFDJRasR/zCxX43dHJf6IvPLSvtqr tklZR3oTHy0zplc10ONoKpKCKy119QBEUcXrz1Oo6US9ejSe0sxQ6Vs+zLtR6kmLeO3i vHXOUL9q9mUqXk+bL2tcVuMHUhrZPP1KYRc3NROkD5kFaia7iEggoHtDUbiq9gSA8Y+J iap1VxxsVh2yRdaMG9hDRwZp/j7XRdaA9/AqTBLQ7QaM9NNAG8CzYhhoBTng+EwPHqU/ tyeDLWFLZmElgocGQtR1jrB4ySjno+zMB+m2U/GkDTCt1t2NIE1e2YCxprZnmzodlgTM w1tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0WOritaX7TiJ2UopsHt1F9UHI9/f6Pz6lo2giHHHHfc=; b=7CByO8hf5RGL62yCTy/tZ8Q8orUq2P3chiqNafspPnQS7LAUFB9+ouuSfF8CtAt4oF mAKZeT+6OXlxso2/ih3hkq7IqbJFNpZ/G+2JmC0SqVjsSZnL13EYr8kmA8CLgVD3/TrI 9FGX/bztRmJhmafoOdAa1t9E3dp4Gt8VCiMLvmC5FisFI93BE3EdyeStL3C5ERQOGrb/ oGIbrzXHx11x0YKTqq/aEue4UqVdOimZ1f1gIYrcVikpukHw5RHu8Qb4THmP7g/+LJHf Z4ZpzzDd2L0D/JToqpoM+2F2ubjmNehvSqE/ESIo4lbTe+jjsl/uppEq0itVUFLWWW59 CbOQ== X-Gm-Message-State: AOAM533avfW4uAErnYgZw1lAxH77HS6+gXDTv4Ffoi/1L+ZoClVuVheu qdp68x6KL9joMGktcPKipbeVGQ== X-Google-Smtp-Source: ABdhPJzGdqYQa5SLHwgOMU9gEnMe0J8cSx5N3gasbEOGt8sIW3sW/mNltLBQn2gM6MAQ/S5AV3AtcQ== X-Received: by 2002:a5d:42c8:0:b0:20a:d91f:87b5 with SMTP id t8-20020a5d42c8000000b0020ad91f87b5mr12678734wrr.301.1652082546379; Mon, 09 May 2022 00:49:06 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id bw22-20020a0560001f9600b0020c5253d8d8sm11784768wrb.36.2022.05.09.00.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:49:05 -0700 (PDT) From: Corentin Labbe To: alexandre.torgue@foss.st.com, andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, peppe.cavallaro@st.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, Corentin Labbe Subject: [PATCH 1/6] phy: handle optional regulator for PHY Date: Mon, 9 May 2022 07:48:52 +0000 Message-Id: <20220509074857.195302-2-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_004910_396756_303D9D3D X-CRM114-Status: GOOD ( 14.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add handling of optional regulators for PHY. Regulators need to be enabled before PHY scanning, so MDIO bus initiate this task. Signed-off-by: Corentin Labbe --- drivers/net/mdio/fwnode_mdio.c | 32 ++++++++++++++++++++++++++++++++ drivers/net/phy/phy_device.c | 20 ++++++++++++++++++++ include/linux/phy.h | 3 +++ 3 files changed, 55 insertions(+) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 1c1584fca632..c377cadc14c3 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -10,6 +10,7 @@ #include #include #include +#include MODULE_AUTHOR("Calvin Johnson "); MODULE_LICENSE("GPL"); @@ -95,6 +96,8 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, bool is_c45 = false; u32 phy_id; int rc; + struct regulator *regulator_phy; + struct regulator *regulator_phy_io; mii_ts = fwnode_find_mii_timestamper(child); if (IS_ERR(mii_ts)) @@ -104,6 +107,32 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, "ethernet-phy-ieee802.3-c45"); if (rc >= 0) is_c45 = true; + regulator_phy_io = devm_regulator_get_optional(&bus->dev, "phy-io"); + if (IS_ERR(regulator_phy_io)) { + rc = PTR_ERR(regulator_phy_io); + if (rc == -ENODEV) + regulator_phy_io = NULL; + else + return rc; + } + regulator_phy = devm_regulator_get_optional(&bus->dev, "phy"); + if (IS_ERR(regulator_phy)) { + rc = PTR_ERR(regulator_phy); + if (rc == -ENODEV) + regulator_phy = NULL; + else + return rc; + } + if (regulator_phy_io) { + rc = regulator_enable(regulator_phy_io); + if (rc) + return rc; + } + if (regulator_phy) { + rc = regulator_enable(regulator_phy); + if (rc) + return rc; + } if (is_c45 || fwnode_get_phy_id(child, &phy_id)) phy = get_phy_device(bus, addr, is_c45); @@ -114,6 +143,9 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, return PTR_ERR(phy); } + phy->regulator_phy = regulator_phy; + phy->regulator_phy_io = regulator_phy_io; + if (is_acpi_node(child)) { phy->irq = bus->irq[addr]; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 431a8719c635..ce64df596580 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -1785,6 +1786,11 @@ int phy_suspend(struct phy_device *phydev) if (!ret) phydev->suspended = true; + if (phydev->regulator_phy) + regulator_disable(phydev->regulator_phy); + if (phydev->regulator_phy_io) + regulator_disable(phydev->regulator_phy_io); + return ret; } EXPORT_SYMBOL(phy_suspend); @@ -1811,6 +1817,20 @@ int phy_resume(struct phy_device *phydev) { int ret; + if (phydev->regulator_phy_io) { + ret = regulator_enable(phydev->regulator_phy_io); + if (ret) + return ret; + } + if (phydev->regulator_phy) { + ret = regulator_enable(phydev->regulator_phy); + if (ret) { + if (phydev->regulator_phy_io) + regulator_disable(phydev->regulator_phy_io); + return ret; + } + } + mutex_lock(&phydev->lock); ret = __phy_resume(phydev); mutex_unlock(&phydev->lock); diff --git a/include/linux/phy.h b/include/linux/phy.h index 2d12054932ba..c29f45668d94 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -704,6 +704,9 @@ struct phy_device { void (*phy_link_change)(struct phy_device *phydev, bool up); void (*adjust_link)(struct net_device *dev); + struct regulator *regulator_phy; + struct regulator *regulator_phy_io; + #if IS_ENABLED(CONFIG_MACSEC) /* MACsec management functions */ const struct macsec_ops *macsec_ops; From patchwork Mon May 9 07:48:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12843105 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E2906C433EF for ; Mon, 9 May 2022 07:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7PGgWOO92Pf/RCN/mZof8T9J6+eD5ss95EJMY1GZgvo=; b=4VOyrjUKuSzuVf wsM2b2/2Y3Nvf40jalpdMQO5GN+CfJYi/1VIePd+gicNItDaA5vh0ocvoe4AN5LAN3aclyOCP+XKf zmovIxpqQnrApWpCCKN1zG5vLtKRraeocw9wrv9bPHmCr4oOim8Xo5amnf6mPokcgEIw4Xj/waIzO L5XQFbnVxijviSUSWy7rnqlZM4x89flDrosGpkKHXHpBtsO4Jd4NfadsZDhKCmdh9BTJ1p6YxWMzz ctqKMsKArmLnhhtKzGUvhp7nMGk+LagF+lJzQIwlyKe/RECeevdEetsllzDTpf3UkCG/59QhnqQWs RlRVnDwye0FGwjXE9boA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny9f-00Cxhw-Bh; Mon, 09 May 2022 07:50:07 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8k-00CxTR-G2 for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 07:49:14 +0000 Received: by mail-wm1-x333.google.com with SMTP id q20so7869075wmq.1 for ; Mon, 09 May 2022 00:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VgEKyO0L0uA3SGFAWkGQhNMbC7clsq3EFnRg59TyA70=; b=bBiGh/AhGl38/MpaSnWoH0kWx8noJq58musIpZ/g2oeqIKpuW2Su1Y4ZgNGVc2+Dz6 eXZiC83MRh77Kw3wvrYE2FR9xnbKOu9zRJEiqGkQIGyxLFuKlF9LDz5gXlubAdjw1rDy WwH53vZ1MkSY48ocvhfyQEHnOx3fjcof2u4WLTKJmBcsRR3KDpvkUKuhW7s9VWTNwXfv RveFcmrPMlo9oDIBI6fj7bhQ8q8DTI/LJBkvk9rJAWZ6ecAiiJWhEHZfOE9jTwbD8Mde Lah4Ki9hI1OHi/rRtcH5nwvxEwepu0M84Wkgdz7Ei73qHvAm68iq93wkbgAhbBr5uQ4V 9BVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VgEKyO0L0uA3SGFAWkGQhNMbC7clsq3EFnRg59TyA70=; b=iAVvH6VozlWFGk2NcnMcOB3xbsgBP1C1SwF6Dj+t1J6yRXAtecQRIVPObh2OUyj+DN i2Zx11Kh5QzBl41Yj46jHEtFIc1JJ61oibyM5FVqW7oxEEtrGCuOMoHJ/wJlk0VQuuMN M5L8JiWhyikumvumLDC8bgOm0Dz/nINpFVfjfFBbhMCYLUl8ZNM28JXIfzFxdWpUGZsJ vNEvxLelsIgeh7YvSl+NnfbN49kgEzaXQOYeXSCcnSBXxDUlnfyjIT/TSkPBgcqht8u6 2oxzclx3h33X8riFAs1k2H81uFY1SnEZdMMOMDq9Xz4TmooDgFvrfYSUBylEkS+bnvWu +B/A== X-Gm-Message-State: AOAM530WqxsHCi/VNpk0gDTEbGlcFbo/OsYMmNgpcviTuC2eI0OSBXhU UfHeE2bcOFx1bR5eF2lFveE4nw== X-Google-Smtp-Source: ABdhPJwiYLJm2AFKSikbo89a1SKZiOmfCAFxQ5X7TJwAoWGnUQJ66VAG9OF9Sr3O4w9WN8Znulrgyg== X-Received: by 2002:a7b:c202:0:b0:394:1e7d:af44 with SMTP id x2-20020a7bc202000000b003941e7daf44mr14700879wmi.139.1652082547691; Mon, 09 May 2022 00:49:07 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id bw22-20020a0560001f9600b0020c5253d8d8sm11784768wrb.36.2022.05.09.00.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:49:07 -0700 (PDT) From: Corentin Labbe To: alexandre.torgue@foss.st.com, andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, peppe.cavallaro@st.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, Corentin Labbe Subject: [PATCH 2/6] net: stmmac: dwmac-sun8i: remove regulator Date: Mon, 9 May 2022 07:48:53 +0000 Message-Id: <20220509074857.195302-3-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_004910_605470_C4C42250 X-CRM114-Status: GOOD ( 19.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now regulator is handled by phy core, there is no need to handle it in stmmac driver. Signed-off-by: Corentin Labbe --- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index f834472599f7..17888813c707 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -59,7 +58,6 @@ struct emac_variant { /* struct sunxi_priv_data - hold all sunxi private data * @ephy_clk: reference to the optional EPHY clock for the internal PHY - * @regulator: reference to the optional regulator * @rst_ephy: reference to the optional EPHY reset for the internal PHY * @variant: reference to the current board variant * @regmap: regmap for using the syscon @@ -69,7 +67,6 @@ struct emac_variant { */ struct sunxi_priv_data { struct clk *ephy_clk; - struct regulator *regulator; struct reset_control *rst_ephy; const struct emac_variant *variant; struct regmap_field *regmap_field; @@ -568,29 +565,11 @@ static int sun8i_dwmac_init(struct platform_device *pdev, void *priv) { struct net_device *ndev = platform_get_drvdata(pdev); struct sunxi_priv_data *gmac = priv; - int ret; - if (gmac->regulator) { - ret = regulator_enable(gmac->regulator); - if (ret) { - dev_err(&pdev->dev, "Fail to enable regulator\n"); - return ret; - } - } - - if (gmac->use_internal_phy) { - ret = sun8i_dwmac_power_internal_phy(netdev_priv(ndev)); - if (ret) - goto err_disable_regulator; - } + if (gmac->use_internal_phy) + return sun8i_dwmac_power_internal_phy(netdev_priv(ndev)); return 0; - -err_disable_regulator: - if (gmac->regulator) - regulator_disable(gmac->regulator); - - return ret; } static void sun8i_dwmac_core_init(struct mac_device_info *hw, @@ -1034,9 +1013,6 @@ static void sun8i_dwmac_exit(struct platform_device *pdev, void *priv) if (gmac->variant->soc_has_internal_phy) sun8i_dwmac_unpower_internal_phy(gmac); - - if (gmac->regulator) - regulator_disable(gmac->regulator); } static void sun8i_dwmac_set_mac_loopback(void __iomem *ioaddr, bool enable) @@ -1157,15 +1133,6 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) return -EINVAL; } - /* Optional regulator for PHY */ - gmac->regulator = devm_regulator_get_optional(dev, "phy"); - if (IS_ERR(gmac->regulator)) { - if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) - return -EPROBE_DEFER; - dev_info(dev, "No regulator found\n"); - gmac->regulator = NULL; - } - /* The "GMAC clock control" register might be located in the * CCU address range (on the R40), or the system control address * range (on most other sun8i and later SoCs). From patchwork Mon May 9 07:48:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12843104 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1EBFBC433F5 for ; Mon, 9 May 2022 07:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YYC8nIJ0SB/uFEuMDKgsggBbPYlkJ881SBfxh0VGIU8=; b=2JzIoMWo9fC24V 6XsjgJICg3VGfvnoFdFir1t3SnN93V/wb1Q1butIbO7WzO6CvZ91XcQ3oFn6cycQbMi4VeLRaiEju Ur1hq3gMOKUbOVG+GZa6fgMU0H3yXWwzUboHgY0Vc6bMyVLMfc+X85duX7I+NbKMCu3v1xNXcxMpU dRLvAzTgRDaZasr7FSoYHDHwWuc6Z3bPUL3ReYmwuSTFoaM8olzQBxk97IuQewIIuo/J8sTt0thAV 57yJAppfZ4uWGSL/8UNgH6BAJw3TLA0BDemxmZ00ERDC0rg3vZUaq1TZSPpsyRTRdN+ORqYZIbEht Nt5qBQTtiQDXOlnQS0rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny9N-00Cxd2-8k; Mon, 09 May 2022 07:49:49 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8l-00CxTm-NC for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 07:49:14 +0000 Received: by mail-wm1-x32f.google.com with SMTP id i20-20020a05600c355400b0039456976dcaso5627213wmq.1 for ; Mon, 09 May 2022 00:49:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qMrSL3AMHGC+RTK3h8kNDAa260PauJUqXlYjnxZrCPw=; b=j8P/nWstf2G5gLaKTxZaAiqLCVOFotDTnu2DFmPNl9kH9oH5DoETD+nmuufHH5yH/V MC+xp3DhGDu9f5UrP8EFmn74sOiYY1T7vcCv4vYfDQWbMgAmftI6FWb5fOsi88qZu6/b 3oTkMitgehUqVRveNC7/2GmBk26P7cOxsFmePBDbL3QdMvKA8dfoEHcjYCzjUVeXVZAR DXNSbu/WBCnAIdw7L4+TTJR6C9W+hQ+Uzz/HjZPGhF4nRLpxYtUe3Cp/yAHLTZWJ990K FJlFuUkfsYpaOKpdlmX2Llth5Zk1NsSF/pMzV8UlhdJTkwZ7h9eZ7vFSqxxXIL5O29iD KA6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qMrSL3AMHGC+RTK3h8kNDAa260PauJUqXlYjnxZrCPw=; b=FL+90jE6zPmnmWIE8x+GsPHMm76sCuDpvMzVki2/ioIliaJX7bWBFpjFRxG+AcaMGH g733gJs79inAUgjk8wl6f5vqTspYNpoHlAUEPLIGbvaKa5vMTuR3qbxjnWXHPnB7aW8H wLaPl2NLKtLTD33O0xir/LhOb/PuQVg8wKLDK+6rLRPtyWIUuMZd8PmJoUIhQTwM3tyA TD8akJaK5gGE4Zvkk3nxOCIovfnkT3MNOJ+TXVxTNRenLU2Z4hLo9h5cKrVU05g6migp 8WThK/HtLyo256qJudeoQ6QszUq214B373EoSDjYnLHCvfnMUrhIfViaLAysVauetus9 1VZQ== X-Gm-Message-State: AOAM5331xn0yhrFOjo00PhjKIFiojEBETOIHBDR/J+rz7DZsf9cvT6qU vjE/5CUeTeQcL9uFrS5eA7ntiA== X-Google-Smtp-Source: ABdhPJyH3fd92bgA2uhnaxAe8vtAphLXWX8wAKMdKQ1ZnKM4LCqbUKVDjIMxph/XhaUGywElhXsEBQ== X-Received: by 2002:a05:600c:20e:b0:394:2985:6d0c with SMTP id 14-20020a05600c020e00b0039429856d0cmr21057310wmi.106.1652082548836; Mon, 09 May 2022 00:49:08 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id bw22-20020a0560001f9600b0020c5253d8d8sm11784768wrb.36.2022.05.09.00.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:49:08 -0700 (PDT) From: Corentin Labbe To: alexandre.torgue@foss.st.com, andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, peppe.cavallaro@st.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, Corentin Labbe Subject: [PATCH 3/6] dt-bindings: net: Add documentation for phy-supply Date: Mon, 9 May 2022 07:48:54 +0000 Message-Id: <20220509074857.195302-4-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_004911_837241_B970CA00 X-CRM114-Status: GOOD ( 12.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add entries for the 2 new phy-supply and phy-io-supply. Signed-off-by: Corentin Labbe --- .../devicetree/bindings/net/ethernet-phy.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Documentation/devicetree/bindings/net/ethernet-phy.yaml index ed1415a4381f..2a6b45ddf010 100644 --- a/Documentation/devicetree/bindings/net/ethernet-phy.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml @@ -153,6 +153,16 @@ properties: used. The absence of this property indicates the muxers should be configured so that the external PHY is used. + phy-supply: + description: + Phandle to a regulator that provides power to the PHY. This + regulator will be managed during the PHY power on/off sequence. + + phy-io-supply: + description: + Phandle to a regulator that provides power to the PHY. This + regulator will be managed during the PHY power on/off sequence. + resets: maxItems: 1 From patchwork Mon May 9 07:48:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12843107 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 106D2C433F5 for ; Mon, 9 May 2022 07:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=573jJ/YggO0VEMx6tFHw/26kYYhXoXJluvk25RXVkgg=; b=CuVUiE5PNsewqg TMZ4hrqONx9SoFwLrXLJy43EIkIyqJbXEOvjqrV/fNZ8y2SuyATjUYTEbBoBQf4M2tuzWCvUKnO2r 75GWYoxUkm6l0Y9Hir6BQ4qc6VgzDwvI6DDXNtwvF0aaxb/xGx0/jQWbXNADO9oxZ2JIa8RpTPUNg w1BSJiCq8Pb/kHayfAajyzREi7+GHASzXqagBQy6bPzfGiHFDGO6WoWXT/YmxFhkVohlqRX1K6XLj Vpyqk71MMljqHYxnW5inNGbkLwOQqqVtR78SdXNJEGoj5fE2cRPm6I4DWYURxhn5YDpzzAM14NKdd 6rqOFgdwAD2eaWI1n0/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nnyA6-00Cxsy-Iv; Mon, 09 May 2022 07:50:35 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8n-00CxUf-WA for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 07:49:16 +0000 Received: by mail-wm1-x336.google.com with SMTP id a14-20020a7bc1ce000000b00393fb52a386so10260811wmj.1 for ; Mon, 09 May 2022 00:49:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uxjt2wTyTk7fEyfPktsHOIoGVxBZKrQOY0kyPg5icoY=; b=AL9GeKmvxYTPP1/F4xINTuPLMQDK3Cc2x2Gi/oKoi8VY5+aQwZBOPVxyAnDyDXfPGB namQPtvoZNhKW4V5gv9opgM9nQg8QQwJMPJ0vYZNK3Da7P6zfFDpq1RzaYjQHTBXzz2D H6Lqzzx/snqzPAtpVsfj724pqn643/4Aq3sTSltXuNd0z96MrbJLLNSssdBDmM7zygVm Zg8015mEJ0Nug/q3IDi7ai0AlzEvNJW9ZKjWy9nLz0rFjlWmTVZGx3YLWwTXa6P6+uph BgWY7S4QM9IzcepdNGcVfGmqOdrC2bHCHfK/wEWXVizY8pOT2m0ZZVAg8KTb6kV+VjMs 8t5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uxjt2wTyTk7fEyfPktsHOIoGVxBZKrQOY0kyPg5icoY=; b=4Fm23rS8Fvi5qyKUm9B1jyxOyjQuOiyzoYp12pNEDhsAmJKviwhWPDzd6YwxuiI4wK tccM+SlvJUnAK1fUTVtPmFNYh66+oW+7l+X3COe0ervJX8APmwIzOyk+JBlUMWiGtAsG OpXOptcd6zjRrmq5TKqh/bWO+3u8wCfFY3ql75kMrOR7tOQmAYvezEmwCs6EjxqkUPkh w8nwJKyMaZ06Aeo5abZ44fcQtDY58suXCAG4dYpxagAsGSx7ARDKV5a7S4mU+sLJ10+/ P+b626aB57ZE7XcrmK6ql/VukzYFuLaCPIB8nzg4mVIpOuZD8D/ItXNo8Go4v5UZ9WJS h9kQ== X-Gm-Message-State: AOAM531OvBSXEpf1hQ7KIMoZTYEdw6HVnKDn3QOwDxdEQcQlE2pgr9aN aWFaYamvd4IMwnYDLgo+IJLeFg== X-Google-Smtp-Source: ABdhPJzHtT6mjIAy/Bbyly4ZW0phLlVdydi8UKNC+Gmhx9pd4TeHrT2Z+doG663B1pzMfmtcJLBnAw== X-Received: by 2002:a05:600c:1d0b:b0:394:737f:e3d with SMTP id l11-20020a05600c1d0b00b00394737f0e3dmr16721006wms.5.1652082550028; Mon, 09 May 2022 00:49:10 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id bw22-20020a0560001f9600b0020c5253d8d8sm11784768wrb.36.2022.05.09.00.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:49:09 -0700 (PDT) From: Corentin Labbe To: alexandre.torgue@foss.st.com, andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, peppe.cavallaro@st.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, Corentin Labbe Subject: [PATCH 4/6] ARM: dts: sunxi: move phy regulator in PHY node Date: Mon, 9 May 2022 07:48:55 +0000 Message-Id: <20220509074857.195302-5-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_004914_082763_33212375 X-CRM114-Status: GOOD ( 12.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that PHY core can handle regulators, move regulator handle in PHY node. Signed-off-by: Corentin Labbe --- arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 2 +- arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 2 +- arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 2 +- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +- arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 2 +- arch/arm/boot/dts/sun8i-h3-zeropi.dts | 2 +- arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +- arch/arm/boot/dts/sun8i-r40-oka40i-c.dts | 2 +- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +- arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts index 5a7e1bd5f825..b450be0a45ed 100644 --- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts +++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts @@ -129,7 +129,6 @@ &ehci0 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_sw>; phy-handle = <&rgmii_phy>; phy-mode = "rgmii-id"; allwinner,rx-delay-ps = <700>; @@ -151,6 +150,7 @@ &mdio { rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_sw>; }; }; diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts index 870993393fc2..fe70b350cdbb 100644 --- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts +++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts @@ -181,7 +181,6 @@ &ehci1 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_dldo4>; phy-handle = <&rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -201,6 +200,7 @@ &mdio { rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dldo4>; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts index a2f2ef2b0092..c393612f44c6 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts @@ -103,7 +103,6 @@ &ehci2 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii"; @@ -114,6 +113,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts index 26e2e6172e0d..70bde396856b 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts @@ -80,7 +80,6 @@ &ehci2 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -90,6 +89,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@7 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index d05fa679dcd3..c6dcf1af3298 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts @@ -83,7 +83,6 @@ &ehci3 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; @@ -94,6 +93,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts index b6ca45d18e51..61eb8c003186 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts @@ -65,7 +65,6 @@ reg_gmac_3v3: gmac-3v3 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -75,5 +74,6 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-zeropi.dts b/arch/arm/boot/dts/sun8i-h3-zeropi.dts index 7d3e7323b661..54174ef18823 100644 --- a/arch/arm/boot/dts/sun8i-h3-zeropi.dts +++ b/arch/arm/boot/dts/sun8i-h3-zeropi.dts @@ -65,13 +65,13 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@7 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_gmac_3v3>; }; }; &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts index a6a1087a0c9b..b1f269bbd479 100644 --- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -130,7 +130,6 @@ &gmac { pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; phy-mode = "rgmii-id"; - phy-supply = <®_dc1sw>; status = "okay"; }; @@ -138,6 +137,7 @@ &gmac_mdio { phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dc1sw>; }; }; diff --git a/arch/arm/boot/dts/sun8i-r40-oka40i-c.dts b/arch/arm/boot/dts/sun8i-r40-oka40i-c.dts index 0bd1336206b8..c43476b426df 100644 --- a/arch/arm/boot/dts/sun8i-r40-oka40i-c.dts +++ b/arch/arm/boot/dts/sun8i-r40-oka40i-c.dts @@ -93,7 +93,6 @@ &gmac { pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; phy-mode = "rgmii-id"; - phy-supply = <®_dcdc1>; status = "okay"; }; @@ -101,6 +100,7 @@ &gmac_mdio { phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dcdc1>; }; }; diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index 47954551f573..050a649d7bda 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -121,7 +121,6 @@ &gmac { pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; phy-mode = "rgmii-id"; - phy-supply = <®_dc1sw>; status = "okay"; }; @@ -129,6 +128,7 @@ &gmac_mdio { phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dc1sw>; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index c8ca8cb7f5c9..ab9bf4bf7343 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -130,7 +130,6 @@ &gmac { pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; phy-mode = "rgmii-id"; - phy-supply = <®_cldo1>; status = "okay"; }; @@ -142,6 +141,7 @@ &i2c3 { &mdio { phy1: ethernet-phy@1 { + phy-supply = <®_cldo1>; reg = <1>; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 5c3580d712e4..48219b8049b1 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -125,13 +125,13 @@ &gmac { pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; phy-mode = "rgmii-id"; - phy-supply = <®_cldo1>; status = "okay"; }; &mdio { phy1: ethernet-phy@1 { reg = <1>; + phy-supply = <®_cldo1>; }; }; diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi index d03f5853ef7b..65f0a3c2af3f 100644 --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi @@ -125,7 +125,6 @@ &ehci2 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; @@ -136,6 +135,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; From patchwork Mon May 9 07:48:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12843109 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3A894C433F5 for ; Mon, 9 May 2022 07:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/F7v8ZnReGYtTihEmX3CVtTEULDM/0VhRt6ccOn5Zz0=; b=vK2Uy+5XDs7yFR o2KvasU5NQAuQEEuATh/mRt/vxGLBLFAAU5G+yV4xHa8JFCL3fdcBNS86cpxNUwKBRa8SrY/9CA2J q4l+6nmGUK/g8hBo3mSFR5xhz4TXBg33lsz0kl0qXcOkpxPDoP5+TsDELM6fPygEdIprK6PduOaWm ZXRWeU84UtbeVdLniqpcpy8LXXSsaVbNKC+tPelolY4YFXu1gjxAlJCSR1ZiI98+uWHBSpPdttTN9 qgqApWRU9EPEtPcvhg48i8ZtGjI5y9t4Kvr3cSHUZ/nu49NTizzF6oZY9hKl8f7w9Ce6Movt4vmcs YCQCqsl6gadgGxYVqGoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nnyBB-00CyNV-Se; Mon, 09 May 2022 07:51:42 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8p-00CxUw-7B for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 07:49:19 +0000 Received: by mail-wm1-x32a.google.com with SMTP id m2-20020a1ca302000000b003943bc63f98so7748200wme.4 for ; Mon, 09 May 2022 00:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zTaVkhFaCPYCczWcQ3UIpvV8zmzZn3hB54zbZQSdmG4=; b=1DemtbvsRKtrhV3ePwedVSa4B6ZoyqXgD8J6jeaNE+U7pHBpMoZkYswymkl3R+QtPC v6781QcDXuR2Vd6m5X8WXhiQ8kFXOL6HVYCt9XlOA0oYxEqbhwT4ErSXlX0NeIT/Lrif MTfBZCPJVeT+Of6w2Km68jO2N1GGLmZgsKYxMXBrJkhwoPEYRemJnoWp8AlyjXhpp1yS O1S/ckT6MCH73GhyuQR/uo4yYgg0FLubgZbmIEHlauLRA/LYykhTpj9GY03VVw9C/Mjk 2bM/NsNHjg6saLcO+OGmRXztU7DtK6IVRoHzvexneF8yDdKSqdinD2QoEfpPmyhCfB2u s1PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zTaVkhFaCPYCczWcQ3UIpvV8zmzZn3hB54zbZQSdmG4=; b=eQ/H6alqv6xcQ8Nv4BGWdf4N285zBqShoP+tNzPY/EQHZIC9Y+MLqzXUZ8QPdH6GWP UuO5Dw+JJqmXJg402vaK5TvAvIbzg7OZdcrA3nZyItbbO7yVBG2+ApwXhkEXSb5xWlYk 97w8CoM3owSqItfzqM5Io6UzBN4adaHV0cA6yQHVZLgTo6Ot3ACmQMGqssMcrPm+p8mo joOmhmJFYx0T6t6LALVJe78Dh9FBrcLw8C8fjUqWhzSib2gMjiO23YbV9AJg8rZUn4D8 vC2wDt9hIBkQQo2O8+mWcrsF47npm68yRsRAy6vehP1/e5T598Bl9QYISqsN+owZ3Aj+ Nbdw== X-Gm-Message-State: AOAM5333uGueuHNi0ff2bxnNiWG/B1ppfreGqsdcExXzPqf+9T+jsguv +vQIN6F8Me/6eiulj9UbpI0IHg== X-Google-Smtp-Source: ABdhPJxQckEVugqpsah7Dbi8JOUeJ6p80TG34ZBuqw6yeCfFRMA5KFoFE/sun4z2Jhb4d+BrpE4+nw== X-Received: by 2002:a05:600c:3490:b0:394:5616:ac78 with SMTP id a16-20020a05600c349000b003945616ac78mr14892739wmq.80.1652082551264; Mon, 09 May 2022 00:49:11 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id bw22-20020a0560001f9600b0020c5253d8d8sm11784768wrb.36.2022.05.09.00.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:49:10 -0700 (PDT) From: Corentin Labbe To: alexandre.torgue@foss.st.com, andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, peppe.cavallaro@st.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, Corentin Labbe Subject: [PATCH 5/6] arm64: dts: allwinner: move phy regulator in PHY node Date: Mon, 9 May 2022 07:48:56 +0000 Message-Id: <20220509074857.195302-6-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_004915_333253_9BD1CC06 X-CRM114-Status: GOOD ( 12.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that PHY core can handle regulators, move regulator handle in PHY node. Signed-off-by: Corentin Labbe --- arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- .../boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- .../boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- .../boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts | 2 +- .../boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +- .../arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- .../boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- .../boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 8 ++++---- arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 997a19372683..f44345e0f749 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -107,7 +107,6 @@ &emac { pinctrl-0 = <&rgmii_pins>; phy-mode = "rgmii-id"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dc1sw>; status = "okay"; }; @@ -134,6 +133,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dc1sw>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index e47ff06a6fa9..9923d8fb3289 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -82,7 +82,6 @@ &emac { pinctrl-0 = <&rgmii_pins>; phy-mode = "rgmii"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dcdc1>; status = "okay"; }; @@ -106,6 +105,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_dcdc1>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts index 577f9e1d08a1..ec511efee942 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts @@ -30,7 +30,6 @@ &emac { pinctrl-0 = <&rgmii_pins>; phy-mode = "rgmii"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dc1sw>; allwinner,tx-delay-ps = <600>; status = "okay"; }; @@ -55,6 +54,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dc1sw>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts index bfb806cf6d7a..c172cc4291b7 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts @@ -104,7 +104,6 @@ &emac { pinctrl-0 = <&rgmii_pins>; phy-mode = "rgmii"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dcdc1>; allwinner,tx-delay-ps = <600>; status = "okay"; }; @@ -124,6 +123,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dcdc1>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index c519d9fa6967..3f9622f141b6 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -122,7 +122,6 @@ &emac { pinctrl-0 = <&rgmii_pins>; phy-mode = "rgmii-id"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_gmac_3v3>; status = "okay"; }; @@ -141,6 +140,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 2accb5ddf783..70039380d454 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -83,7 +83,6 @@ &emac { pinctrl-0 = <&rmii_pins>; phy-mode = "rmii"; phy-handle = <&ext_rmii_phy1>; - phy-supply = <®_dc1sw>; status = "okay"; }; @@ -111,6 +110,7 @@ &mdio { ext_rmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dc1sw>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 5e66ce1a334f..716a8c1faef2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -81,7 +81,6 @@ &emac { pinctrl-0 = <&rgmii_pins>; phy-mode = "rgmii-txid"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dc1sw>; status = "okay"; }; @@ -100,6 +99,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_dc1sw>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts index 6e30a564c87f..4e3dae6ee3a4 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts @@ -34,7 +34,6 @@ &codec { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; /delete-property/ allwinner,leds-active-low; @@ -45,6 +44,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts index 4c3921ac236c..e07142b0cddf 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts @@ -94,7 +94,6 @@ &ehci3 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -104,6 +103,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@7 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts index 05486cccee1c..77940e90bd36 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts @@ -73,7 +73,6 @@ &ehci3 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -83,6 +82,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@7 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts index 55b369534a08..7280bcbc0f40 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts @@ -125,7 +125,6 @@ &ehci2 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -135,6 +134,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@7 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts index 1010c1b22d2e..95bc670a4b8e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts @@ -121,7 +121,6 @@ &ehci3 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -131,6 +130,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts index 74e0444af19b..8b4403ca610f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts @@ -122,7 +122,6 @@ &ehci3 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -132,6 +131,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts index 7ec5ac850a0d..74d2a60ce113 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts @@ -67,7 +67,6 @@ &ehci1 { &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; phy-mode = "rgmii-id"; status = "okay"; @@ -77,6 +76,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts index 6249e9e02928..ecfb99c07f69 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts @@ -99,7 +99,6 @@ &emac { pinctrl-0 = <&ext_rgmii_pins>; phy-mode = "rgmii-id"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_aldo2>; status = "okay"; }; @@ -122,6 +121,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_aldo2>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts index 686f58e77004..6594d2e5284a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts @@ -18,12 +18,12 @@ wifi_pwrseq: wifi_pwrseq { }; }; -&hdmi_connector { - /delete-property/ ddc-en-gpios; +&ext_rgmii_phy { + phy-supply = <®_aldo2>; }; -&emac { - phy-supply = <®_aldo2>; +&hdmi_connector { + /delete-property/ ddc-en-gpios; }; &mmc1 { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts index 1ffd68f43f87..dae637720432 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts @@ -102,7 +102,6 @@ &emac { pinctrl-0 = <&ext_rgmii_pins>; phy-mode = "rgmii-id"; phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_gmac_3v3>; allwinner,rx-delay-ps = <200>; allwinner,tx-delay-ps = <200>; status = "okay"; @@ -127,6 +126,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <®_gmac_3v3>; }; }; From patchwork Mon May 9 07:48:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12843108 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07F4DC433EF for ; Mon, 9 May 2022 07:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UgKqvO8Bz1Gpr6PF10+xITkbZoh+4gFAWT9ugJ9KBUE=; b=Bh7k0LdNj0zBAF pnuMp9fqByXp5RFOiilO22FFdnJzdbPgYmIBFy3ciLwTmqp7usn+c3Jq+s5/FTpGq9UEVgDs7itqh 26pyi5gU2ohENPN04wugGqtEV6dANDxrDvZaC+BEd0fBjP2nnOtrmba5DuL1sOTsvN/Ru1CTkkWtL OocMWV8BCIon+98nNKj1v+Sh1ZfJwdE+ztESsGAfDxj/odK7llTdahkzf0xZ3svZfhwT0elwbKBr1 2a1uB/DwgpaiLpn6pOPVZvzEA3XZUOEG+foXe0c7NPtuen/0H6S8fN251168GnHtIpukgEPEnpb42 JZCwymlV8ZIQnpu02tQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nnyAW-00Cy3I-86; Mon, 09 May 2022 07:51:00 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nny8q-00CxVs-Ci for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 07:49:18 +0000 Received: by mail-wr1-x42a.google.com with SMTP id v12so18147095wrv.10 for ; Mon, 09 May 2022 00:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q/wAy1TbeV5Udmm91pas07M2plXYLkR5RXGzDlfWEKs=; b=Mz1U3xqaHzLf32jHaFUq5wH5UT6+YXlAZPhIPFuRedkXRkRdOeYm6T5Sf4ZeCe5W/a XTqwpmUYrJcOkXvnkKoB7Ce/bTPuGRI8wkuPhY1W78BYk5dB/rmCRRoUUg015Qu92LLh VBHZ06pkjyW4KEjczSJQBSwtoXnVx3i8cX+bhdWV/f0Hat/8+DjZbIH1QJ02cqvrjh6E /DGL6om7h5LGaqo7+b4GZSo24Rt0Px0MC12dRvbog2yJPVjc8imq5h20UFv2z4zT5pdE fWhPA3VnJMfdV/dVtUvXJOW7rvYFb0GavCDb/7KrcDegzW8gOLRliFSBhFBBEoxvD/HM hvyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q/wAy1TbeV5Udmm91pas07M2plXYLkR5RXGzDlfWEKs=; b=yYTsEbgRSvrXOq7NWW3sK/gutVpk4bSb13DhuQUkh3qokeJwcZx4ARS/5G0MHtNwbb qApGKbpLZyg8GpRUwoXJhSUgAeFqIsG6RuRJI13UkA2ciPwTuIMiYxpLM2hFyraqoXed gy8yjm+eaZ3+P1TEcVfGSs2hZUadiDwKTvTYYSI+75wXcAMLY1MoWLmamZ6T/xufy0IF FvIJa0E3xXE8VVaqVzldk25rqPg+p93TiYfj61OE+AOXM7ymvbsJXFuG3qZery1Ap20g WStZpOqbu20wuHGseZfLDbb/SID+kiK3+RS6Zw/U0tbyrKOIDH5n6dHbqz/0PDzbHcV5 rfmQ== X-Gm-Message-State: AOAM532CIbpg7MkX+ZNRW/MyljeGTUOc8gf/XHYAYefR5xCTgbyJCWWV oTaseZSEEbfHHXITS0M0O7+9+Q== X-Google-Smtp-Source: ABdhPJzL/bzJC/0GZFFuu0/iBuWDwc79RvZ2RpR+JFTjPC3wz1nhPclk6lVJ8xe3Uqv4ZuISsOMxUg== X-Received: by 2002:adf:eb87:0:b0:20c:a5b5:6731 with SMTP id t7-20020adfeb87000000b0020ca5b56731mr12936661wrn.199.1652082552477; Mon, 09 May 2022 00:49:12 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id bw22-20020a0560001f9600b0020c5253d8d8sm11784768wrb.36.2022.05.09.00.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:49:12 -0700 (PDT) From: Corentin Labbe To: alexandre.torgue@foss.st.com, andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, peppe.cavallaro@st.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, =?utf-8?q?Ond=C5=99ej_Jirman?= , Corentin Labbe Subject: [PATCH 6/6] arm64: dts: allwinner: orange-pi-3: Enable ethernet Date: Mon, 9 May 2022 07:48:57 +0000 Message-Id: <20220509074857.195302-7-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_004916_510390_B6DD11AE X-CRM114-Status: GOOD ( 15.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: OndÅ™ej Jirman Orange Pi 3 has two regulators that power the Realtek RTL8211E PHY. According to the datasheet, both regulators need to be enabled at the same time, or that "phy-io" should be enabled slightly earlier than "phy" regulator. RTL8211E/RTL8211EG datasheet says: Note 4: 2.5V (or 1.8/1.5V) RGMII power should be risen simultaneously or slightly earlier than 3.3V power. Rising 2.5V (or 1.8/1.5V) power later than 3.3V power may lead to errors. The timing is set in DT via startup-delay-us. Signed-off-by: Ondrej Jirman Signed-off-by: Corentin Labbe --- .../dts/allwinner/sun50i-h6-orangepi-3.dts | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts index c45d7b7fb39a..fd1d4f5bbc83 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts @@ -13,6 +13,7 @@ / { compatible = "xunlong,orangepi-3", "allwinner,sun50i-h6"; aliases { + ethernet0 = &emac; serial0 = &uart0; serial1 = &uart1; }; @@ -55,6 +56,15 @@ led-1 { }; }; + reg_gmac_2v5: gmac-2v5 { + compatible = "regulator-fixed"; + regulator-name = "gmac-2v5"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + enable-active-high; + gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */ + }; + reg_vcc5v: vcc5v { /* board wide 5V supply directly from the DC jack */ compatible = "regulator-fixed"; @@ -113,6 +123,33 @@ &ehci3 { status = "okay"; }; +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&ext_rgmii_pins>; + phy-mode = "rgmii-id"; + phy-handle = <&ext_rgmii_phy>; + status = "okay"; +}; + +&mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + /* + * The board uses 2.5V RGMII signalling. Power sequence to enable + * the phy is to enable GMAC-2V5 and GMAC-3V (aldo2) power rails + * at the same time and to wait 100ms. The driver enables phy-io + * first. Delay is achieved with enable-ramp-delay on reg_aldo2. + */ + phy-io-supply = <®_gmac_2v5>; + phy-supply = <®_aldo2>; + + reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */ + reset-assert-us = <15000>; + reset-deassert-us = <40000>; + }; +}; + &gpu { mali-supply = <®_dcdcc>; status = "okay"; @@ -211,6 +248,7 @@ reg_aldo2: aldo2 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc33-audio-tv-ephy-mac"; + regulator-enable-ramp-delay = <100000>; }; /* ALDO3 is shorted to CLDO1 */