153 lines
6.6 KiB
Diff
153 lines
6.6 KiB
Diff
From a67170b5bebe0e2c9b46e4439a47ff492f4538ce Mon Sep 17 00:00:00 2001
|
|
Message-Id: <a67170b5bebe0e2c9b46e4439a47ff492f4538ce.1606830718.git.stefan@agner.ch>
|
|
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1606830718.git.stefan@agner.ch>
|
|
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1606830718.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Tue, 1 Dec 2020 00:32:23 +0100
|
|
Subject: [PATCH 17/17] arm64: dts: meson: fix PHY deassert timing requirements
|
|
|
|
According to the datasheet (Rev. 1.9) the RTL8211F requires at least
|
|
72ms "for internal circuits settling time" before accessing the PHY
|
|
egisters. This fixes an issue seen on ODROID-C2 where the Ethernet
|
|
link doesn't come up when using ip link set down/up:
|
|
[ 6630.714855] meson8b-dwmac c9410000.ethernet eth0: Link is Down
|
|
[ 6630.785775] meson8b-dwmac c9410000.ethernet eth0: PHY [stmmac-0:00] driver [RTL8211F Gigabit Ethernet] (irq=36)
|
|
[ 6630.893071] meson8b-dwmac c9410000.ethernet: Failed to reset the dma
|
|
[ 6630.893800] meson8b-dwmac c9410000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
|
|
[ 6630.902835] meson8b-dwmac c9410000.ethernet eth0: stmmac_open: Hw setup failed
|
|
|
|
Fixes: f29cabf240ed ("arm64: dts: meson: use the generic Ethernet PHY reset GPIO bindings")
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 2 +-
|
|
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 +-
|
|
9 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
index 7be3e354093b..de27beafe9db 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
@@ -165,7 +165,7 @@ eth_phy0: ethernet-phy@0 {
|
|
reg = <0>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
|
|
interrupt-parent = <&gpio_intc>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
|
index 70fcfb7b0683..50de1d01e565 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
|
@@ -200,7 +200,7 @@ eth_phy0: ethernet-phy@0 {
|
|
reg = <0>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
|
|
interrupt-parent = <&gpio_intc>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
|
|
index 222ee8069cfa..9b0b81f191f1 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
|
|
@@ -126,7 +126,7 @@ eth_phy0: ethernet-phy@0 {
|
|
reg = <0>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
|
|
interrupt-parent = <&gpio_intc>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
|
|
index d6133af09d64..834b2877e025 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
|
|
@@ -147,7 +147,7 @@ eth_phy0: ethernet-phy@0 {
|
|
reg = <0>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
};
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
|
|
index b08c4537f260..b2ab05c22090 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
|
|
@@ -82,7 +82,7 @@ external_phy: ethernet-phy@0 {
|
|
|
|
/* External PHY reset is shared with internal PHY Led signal */
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
|
|
interrupt-parent = <&gpio_intc>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
index 27eeab71ec77..b4ca43aef303 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
@@ -194,7 +194,7 @@ external_phy: ethernet-phy@0 {
|
|
reg = <0>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
|
|
interrupt-parent = <&gpio_intc>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
|
|
index c2bd4dbbf38c..8dccf91d68da 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
|
|
@@ -112,7 +112,7 @@ external_phy: ethernet-phy@0 {
|
|
max-speed = <1000>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
};
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
|
|
index ea45ae0c71b7..8edbfe040805 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
|
|
@@ -64,7 +64,7 @@ external_phy: ethernet-phy@0 {
|
|
|
|
/* External PHY reset is shared with internal PHY Led signal */
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
|
|
interrupt-parent = <&gpio_intc>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
|
|
index c89c9f846fb1..dde7cfe12cff 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
|
|
@@ -114,7 +114,7 @@ external_phy: ethernet-phy@0 {
|
|
max-speed = <1000>;
|
|
|
|
reset-assert-us = <10000>;
|
|
- reset-deassert-us = <30000>;
|
|
+ reset-deassert-us = <80000>;
|
|
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
|
|
};
|
|
};
|
|
--
|
|
2.29.2
|
|
|