[PATCH] ARM: dts: sun7i: bananapi: Enable RGMII RX/TX delay on Ethernet PHY

46 views
Skip to first unread message

Pablo Greco

unread,
Oct 31, 2020, 8:34:44 PM10/31/20
to linux...@googlegroups.com, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
The Ethernet PHY on the Bananapi M1 has the RX and TX delays enabled on
the PHY, using pull-ups on the RXDLY and TXDLY pins.

Fix the phy-mode description to correct reflect this so that the
implementation doesn't reconfigure the delays incorrectly. This
happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
rx/tx delay config").

Fixes: 8a5b272fbf44 ("ARM: dts: sun7i: Add Banana Pi board")
Signed-off-by: Pablo Greco <pgr...@centosproject.org>
---
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index bb3987e101c2..0b3d9ae75650 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -132,7 +132,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
};
--
2.18.4

Pablo Greco

unread,
Oct 31, 2020, 8:34:47 PM10/31/20
to linux...@googlegroups.com, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
DCDC1 regulator powers many different subsystems. While some of them can
work at 3.0 V, some of them can not. For example, VCC-HDMI can only work
between 3.24 V and 3.36 V. According to OS images provided by the board
manufacturer this regulator should be set to 3.3 V.

Set DCDC1 and DCDC1SW to 3.3 V in order to fix this.

Fixes: 23edc168bd98 ("ARM: dts: sun8i: Add board dts file for Banana Pi M2 Berry")
Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller")
Signed-off-by: Pablo Greco <pgr...@centosproject.org>
---
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

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 3ab6f47cea4f..47954551f573 100644
--- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
@@ -198,16 +198,16 @@
};

&reg_dc1sw {
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-name = "vcc-gmac-phy";
};

&reg_dcdc1 {
regulator-always-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-name = "vcc-3v0";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-3v3";
};

&reg_dcdc2 {
--
2.18.4

Pablo Greco

unread,
Oct 31, 2020, 8:34:47 PM10/31/20
to linux...@googlegroups.com, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
Ethernet PHY on BananaPi M2 Berry provides RX and TX delays. Fix ethernet
node to reflect that fact.

Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller")
Signed-off-by: Pablo Greco <pgr...@centosproject.org>
---
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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 15c22b06fc4b..3ab6f47cea4f 100644
--- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
@@ -120,7 +120,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-supply = <&reg_dc1sw>;

Jernej Škrabec

unread,
Nov 1, 2020, 2:24:11 AM11/1/20
to linux...@googlegroups.com, Pablo Greco, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
Dne nedelja, 01. november 2020 ob 01:34:17 CET je Pablo Greco napisal(a):
> Ethernet PHY on BananaPi M2 Berry provides RX and TX delays. Fix ethernet
> node to reflect that fact.
>
> Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC
ethernet controller")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Acked-by: Jernej Skrabec <jernej....@siol.net>

Thanks!

Jernej


Jernej Škrabec

unread,
Nov 1, 2020, 2:25:51 AM11/1/20
to linux...@googlegroups.com, Pablo Greco, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
Dne nedelja, 01. november 2020 ob 01:34:16 CET je Pablo Greco napisal(a):
> DCDC1 regulator powers many different subsystems. While some of them can
> work at 3.0 V, some of them can not. For example, VCC-HDMI can only work
> between 3.24 V and 3.36 V. According to OS images provided by the board
> manufacturer this regulator should be set to 3.3 V.
>
> Set DCDC1 and DCDC1SW to 3.3 V in order to fix this.
>
> Fixes: 23edc168bd98 ("ARM: dts: sun8i: Add board dts file for Banana Pi M2
Berry")
> Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC
ethernet controller")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Jernej Škrabec

unread,
Nov 1, 2020, 2:29:12 AM11/1/20
to linux...@googlegroups.com, Pablo Greco, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
Dne nedelja, 01. november 2020 ob 01:34:15 CET je Pablo Greco napisal(a):
> The Ethernet PHY on the Bananapi M1 has the RX and TX delays enabled on
> the PHY, using pull-ups on the RXDLY and TXDLY pins.
>
> Fix the phy-mode description to correct reflect this so that the
> implementation doesn't reconfigure the delays incorrectly. This
> happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
> rx/tx delay config").
>
> Fixes: 8a5b272fbf44 ("ARM: dts: sun7i: Add Banana Pi board")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Maxime Ripard

unread,
Nov 2, 2020, 9:07:26 AM11/2/20
to Pablo Greco, linux...@googlegroups.com, Rob Herring, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
Hi,

On Sat, Oct 31, 2020 at 09:34:15PM -0300, Pablo Greco wrote:
> The Ethernet PHY on the Bananapi M1 has the RX and TX delays enabled on
> the PHY, using pull-ups on the RXDLY and TXDLY pins.
>
> Fix the phy-mode description to correct reflect this so that the
> implementation doesn't reconfigure the delays incorrectly. This
> happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
> rx/tx delay config").
>
> Fixes: 8a5b272fbf44 ("ARM: dts: sun7i: Add Banana Pi board")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Thanks for sending those patches.

However, I'm not entirely sure how you sent it but the odd threading you
used (each other patches being in reply to this one without 0/N in the
name) seem to confuse the tools we use to apply the patches.

Can you resend it properly?
Thanks!
Maxime
signature.asc

Pablo Greco

unread,
Nov 2, 2020, 9:16:56 AM11/2/20
to linux...@googlegroups.com, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
The Ethernet PHY on the Bananapi M1 has the RX and TX delays enabled on
the PHY, using pull-ups on the RXDLY and TXDLY pins.

Fix the phy-mode description to correct reflect this so that the
implementation doesn't reconfigure the delays incorrectly. This
happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
rx/tx delay config").

Fixes: 8a5b272fbf44 ("ARM: dts: sun7i: Add Banana Pi board")
Signed-off-by: Pablo Greco <pgr...@centosproject.org>
---
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index bb3987e101c2..0b3d9ae75650 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -132,7 +132,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-supply = <&reg_gmac_3v3>;

Pablo Greco

unread,
Nov 2, 2020, 9:19:29 AM11/2/20
to linux...@googlegroups.com, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
DCDC1 regulator powers many different subsystems. While some of them can
work at 3.0 V, some of them can not. For example, VCC-HDMI can only work
between 3.24 V and 3.36 V. According to OS images provided by the board
manufacturer this regulator should be set to 3.3 V.

Set DCDC1 and DCDC1SW to 3.3 V in order to fix this.

Fixes: 23edc168bd98 ("ARM: dts: sun8i: Add board dts file for Banana Pi M2 Berry")
Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller")
Signed-off-by: Pablo Greco <pgr...@centosproject.org>
---
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

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 3ab6f47cea4f..47954551f573 100644
--- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts

Pablo Greco

unread,
Nov 2, 2020, 9:19:40 AM11/2/20
to linux...@googlegroups.com, Pablo Greco, Rob Herring, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
Ethernet PHY on BananaPi M2 Berry provides RX and TX delays. Fix ethernet
node to reflect that fact.

Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller")
Signed-off-by: Pablo Greco <pgr...@centosproject.org>
---
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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 15c22b06fc4b..3ab6f47cea4f 100644
--- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
@@ -120,7 +120,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-supply = <&reg_dc1sw>;

Pablo Sebastián Greco

unread,
Nov 2, 2020, 9:21:23 AM11/2/20
to Maxime Ripard, linux...@googlegroups.com, Rob Herring, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
I prepared them individually but sent them together in a single
git-send-email, that must have been the problem.
I"ll send them again one by one.

Pablo.

Maxime Ripard

unread,
Nov 2, 2020, 12:06:58 PM11/2/20
to Pablo Greco, linux...@googlegroups.com, Rob Herring, Chen-Yu Tsai, Jernej Skrabec, Hans de Goede, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
On Mon, Nov 02, 2020 at 11:16:40AM -0300, Pablo Greco wrote:
> The Ethernet PHY on the Bananapi M1 has the RX and TX delays enabled on
> the PHY, using pull-ups on the RXDLY and TXDLY pins.
>
> Fix the phy-mode description to correct reflect this so that the
> implementation doesn't reconfigure the delays incorrectly. This
> happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
> rx/tx delay config").
>
> Fixes: 8a5b272fbf44 ("ARM: dts: sun7i: Add Banana Pi board")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Applied thanks!
Maxime
signature.asc

Maxime Ripard

unread,
Nov 2, 2020, 12:07:26 PM11/2/20
to Pablo Greco, linux...@googlegroups.com, Rob Herring, Chen-Yu Tsai, Jernej Skrabec, Icenowy Zheng, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
On Mon, Nov 02, 2020 at 11:19:14AM -0300, Pablo Greco wrote:
> DCDC1 regulator powers many different subsystems. While some of them can
> work at 3.0 V, some of them can not. For example, VCC-HDMI can only work
> between 3.24 V and 3.36 V. According to OS images provided by the board
> manufacturer this regulator should be set to 3.3 V.
>
> Set DCDC1 and DCDC1SW to 3.3 V in order to fix this.
>
> Fixes: 23edc168bd98 ("ARM: dts: sun8i: Add board dts file for Banana Pi M2 Berry")
> Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Applied, thanks!
Maxime
signature.asc

Maxime Ripard

unread,
Nov 2, 2020, 12:07:45 PM11/2/20
to Pablo Greco, linux...@googlegroups.com, Rob Herring, Chen-Yu Tsai, Jernej Skrabec, devic...@vger.kernel.org, linux-ar...@lists.infradead.org, linux-...@vger.kernel.org
On Mon, Nov 02, 2020 at 11:19:29AM -0300, Pablo Greco wrote:
> Ethernet PHY on BananaPi M2 Berry provides RX and TX delays. Fix ethernet
> node to reflect that fact.
>
> Fixes: 27e81e1970a8 ("ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller")
> Signed-off-by: Pablo Greco <pgr...@centosproject.org>

Applied, thanks!
Maxime
signature.asc
Reply all
Reply to author
Forward
0 new messages