[5/6] arm64: dts: allwinner: move phy regulator in PHY node

Message ID	20220509074857.195302-6-clabbe@baylibre.com (mailing list archive)
State	Superseded
Delegated to:	Netdev Maintainers
Headers	show Return-Path: <netdev-owner@kernel.org> From: Corentin Labbe <clabbe@baylibre.com> 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 <clabbe@baylibre.com> 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> In-Reply-To: <20220509074857.195302-1-clabbe@baylibre.com> References: <20220509074857.195302-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	arm64: add ethernet to orange pi 3 \| expand [0/6] arm64: add ethernet to orange pi 3 [1/6] phy: handle optional regulator for PHY [2/6] net: stmmac: dwmac-sun8i: remove regulator [3/6] dt-bindings: net: Add documentation for phy-supply [4/6] ARM: dts: sunxi: move phy regulator in PHY node [5/6] arm64: dts: allwinner: move phy regulator in PHY node [6/6] arm64: dts: allwinner: orange-pi-3: Enable ethernet

Context	Check	Description
netdev/fixes_present	success	Fixes tag not required for -next series
netdev/subject_prefix	success	Link
netdev/cover_letter	success	Series has a cover letter
netdev/patch_count	success	Link
netdev/header_inline	success	No static functions without inline keyword in header files
netdev/build_32bit	success	Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers	success	CCed 8 of 8 maintainers
netdev/build_clang	success	Errors and warnings before: 0 this patch: 0
netdev/module_param	success	Was 0 now: 0
netdev/verify_signedoff	success	Signed-off-by tag matches author and committer
netdev/verify_fixes	success	No Fixes tag
netdev/build_allmodconfig_warn	success	Errors and warnings before: 0 this patch: 0
netdev/checkpatch	success	total: 0 errors, 0 warnings, 0 checks, 240 lines checked
netdev/kdoc	success	Errors and warnings before: 0 this patch: 0
netdev/source_inline	success	Was 0 now: 0
netdev/tree_selection	success	Guessing tree name failed - patch did not apply

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 = <&reg_dc1sw>; status = "okay"; }; @@ -134,6 +133,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <&reg_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 = <&reg_dcdc1>; status = "okay"; }; @@ -106,6 +105,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <7>; + phy-supply = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_dc1sw>; status = "okay"; }; @@ -111,6 +110,7 @@ &mdio { ext_rmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <&reg_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 = <&reg_dc1sw>; status = "okay"; }; @@ -100,6 +99,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_aldo2>; status = "okay"; }; @@ -122,6 +121,7 @@ &mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; + phy-supply = <&reg_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 = <&reg_aldo2>; }; -&emac { - phy-supply = <&reg_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 = <&reg_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 = <&reg_gmac_3v3>; }; };

[5/6] arm64: dts: allwinner: move phy regulator in PHY node

Checks

Commit Message

Patch