author | qi duan <qi.duan@amlogic.com> | 2019-09-04 09:34:59 (GMT) |
---|---|---|
committer | Tao Zeng <tao.zeng@amlogic.com> | 2019-09-16 08:17:10 (GMT) |
commit | 05e9a6f05534465acf280d556a03b06128d22a42 (patch) | |
tree | 5bb11a090c07cdc79579d833af8ebe4d0778aaf2 | |
parent | f2e9723f1df49984473948b794b4b44ccf825ba8 (diff) | |
download | common-05e9a6f05534465acf280d556a03b06128d22a42.zip common-05e9a6f05534465acf280d556a03b06128d22a42.tar.gz common-05e9a6f05534465acf280d556a03b06128d22a42.tar.bz2 |
ETH: add eth reset bit when resume. [1/1]
PD#SWPL-12602
Problem:
omni phy can not connect network probably
after long stress suspend test
for gxl/txl/txlx
Solution:
In suspend/resume sequeue, add eth reset
Verify:
verify on p212/r311
Change-Id: I4b6ab34eb2eae40533f4a33db8fb40a00f5b3d51
Signed-off-by: qi duan <qi.duan@amlogic.com>
85 files changed, 185 insertions, 93 deletions
diff --git a/arch/arm/boot/dts/amlogic/atom.dts b/arch/arm/boot/dts/amlogic/atom.dts index ba5bce1..0062db5 100644 --- a/arch/arm/boot/dts/amlogic/atom.dts +++ b/arch/arm/boot/dts/amlogic/atom.dts @@ -245,7 +245,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts index ff4f679..3670fcd 100644 --- a/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts +++ b/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts @@ -160,7 +160,9 @@ compatible = "amlogic, gxbb-eth-dwmac"; status = "disable"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/axg_s400.dts b/arch/arm/boot/dts/amlogic/axg_s400.dts index 0b304c1..895c378 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400.dts @@ -170,7 +170,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03.dts index 3ac9b55..0395be7 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400_v03.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400_v03.dts @@ -170,7 +170,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts index 40b0c41..b710d87 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts @@ -166,7 +166,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03gva_sbr.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03gva_sbr.dts index 5f32dbb..6a75293 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400_v03gva_sbr.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400_v03gva_sbr.dts @@ -166,7 +166,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts index b6a7d48..34dc3d3 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts @@ -170,7 +170,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts b/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts index b5f4c1f..d701064 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts @@ -179,7 +179,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xff3f0000 0x10000 - 0xff634540 0x8>; + 0xff634540 0x8 + 0xff634558 0xc + 0xffd01008 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts index b281647..7060975 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts @@ -411,7 +411,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts index 12f0013..693e28b 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -379,7 +379,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts index 0ee49ed..5efed17 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -390,7 +390,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts index 839ef9e..5d0e52d 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts @@ -410,7 +410,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts index 74ac46c..ad58950 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -387,7 +387,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts index fb75ada..8960aee 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts @@ -396,7 +396,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts index 9418632..4f8d638 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -393,7 +393,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts index 1da54da..dc9f070 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts @@ -338,7 +338,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts index ab65fb6..25b0775 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts @@ -337,7 +337,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts index bcbc10a..99776f3 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -327,7 +327,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts index b2be483..7164209 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts @@ -474,7 +474,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts index c217fe4..fd58d2ea 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -459,7 +459,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts index 200bebe..245c1dc 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -474,7 +474,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts index 5294a4b..69839698 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts @@ -458,7 +458,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts index 57ace29..a53d507 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts @@ -404,7 +404,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts index 062b3dd..8b6ed4c 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts @@ -410,7 +410,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts index 7545166..4945d45 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts @@ -256,7 +256,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts index cdb27c8..0e2a52a 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts @@ -344,7 +344,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts index 2f447c3..7570280 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts @@ -390,7 +390,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts index c8309f7..ed45ac7 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts @@ -398,7 +398,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxl_skt.dts b/arch/arm/boot/dts/amlogic/gxl_skt.dts index 5ace41a..ce15065 100644 --- a/arch/arm/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm/boot/dts/amlogic/gxl_skt.dts @@ -400,7 +400,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts index 8b4bb51..6e30ad5 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts @@ -389,7 +389,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index b457dbe..97f5813 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -393,7 +393,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts index 9b83e6f..3a5234e 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts @@ -395,7 +395,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts index 6d73a6f..4402966 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts @@ -397,7 +397,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0xc9410000 0x10000 0xc8834540 0x8 - 0xc8834558 0xc>; + 0xc8834558 0xc + 0xc1104408 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm/boot/dts/amlogic/mesontxl.dtsi b/arch/arm/boot/dts/amlogic/mesontxl.dtsi index 1c876ec..e1e8565 100644 --- a/arch/arm/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontxl.dtsi @@ -345,7 +345,7 @@ reg = <0xc9410000 0x10000 0xc8834540 0x8 0xc8834558 0xc - 0xc1104484 0x4>; + 0xc1104408 0x4>; interrupts = <0 8 1 0 9 1>; phy-mode= "rmii"; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts index 36237b6..9603ac4 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts @@ -221,7 +221,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts index b233a7c..c08f69d 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts @@ -190,7 +190,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts index 854ff2b..7f904db 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -229,7 +229,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts index 8dbc397..ea73ed9 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -226,7 +226,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts index 25b4872..04ad8c9 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -223,7 +223,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts index 68165ac..f745e7f 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts @@ -229,7 +229,7 @@ reg = <0xff3f0000 0x10000 0xff634540 0x8 0xff634558 0xc - 0xffd01084 0x4>; + 0xffd01008 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts index 34ba9c2..363642f 100644 --- a/arch/arm64/boot/dts/amlogic/atom.dts +++ b/arch/arm64/boot/dts/amlogic/atom.dts @@ -244,7 +244,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts index b49cb62..3cbf2c4 100644 --- a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts +++ b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts @@ -160,7 +160,9 @@ compatible = "amlogic, gxbb-eth-dwmac"; status = "disable"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts index bf6c537..203fcef 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts @@ -170,7 +170,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts index 6cf5026..d6d9a5f 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts @@ -170,7 +170,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts index 0dda975..8e0ea1c 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts @@ -166,7 +166,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva_sbr.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva_sbr.dts index fc764d8..1220281 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva_sbr.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva_sbr.dts @@ -166,7 +166,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts index ed16bf5..53612e4 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts @@ -170,7 +170,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts index c21e8ed..031618b 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts @@ -179,7 +179,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s410.dts b/arch/arm64/boot/dts/amlogic/axg_s410.dts index 00da043..517acb0 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s410.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s410.dts @@ -160,7 +160,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s410_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s410_v03.dts index 4ddfb1a..4984cf6 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s410_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s410_v03.dts @@ -162,7 +162,9 @@ ethmac: ethernet@0xff3f0000 { compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 - 0x0 0xff634540 0x0 0x8>; + 0x0 0xff634540 0x0 0x8 + 0x0 0xff634558 0x0 0xc + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index 2057f01..8ff67ab 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -406,7 +406,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts index c55cb7f..1ecb305 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -378,7 +378,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts index 0ae1001..27f6142 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -389,7 +389,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index f6f657c..e7354f7 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -407,7 +407,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts index e36ed5e..0f76f4e 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -387,7 +387,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts index d84762b..bebe846 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts @@ -387,7 +387,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts index 1444c1a..65b9e44 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts @@ -394,7 +394,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts index 264d6fe..d2e677a 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -394,7 +394,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts index 482e418..d3ac6f0 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts @@ -337,7 +337,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts index e08cbd8..282ea43 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts @@ -337,7 +337,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts index c8e95a0..160e61e 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -327,7 +327,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts index 4881fc3..f3737e9 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts @@ -470,7 +470,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts index 808726c..4d28be7 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -458,7 +458,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts index d566dc7..6715bbd 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -471,7 +471,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts index 3c0c432..2af5de5 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts @@ -457,7 +457,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts index f76a869..e17e8c3 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts @@ -399,7 +399,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts index 60015a4..e587fa2 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts @@ -407,7 +407,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts index 52e9826..a0d4fbf 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts @@ -256,7 +256,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts index 1ecf233..5b002f8 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts @@ -344,7 +344,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts index 916f139..7446f36 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts @@ -389,7 +389,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts index 8508758..ddd45d5 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts @@ -398,7 +398,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts index b781051..2976a90 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts @@ -399,7 +399,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts index 1fe4844..9fc1602 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts @@ -389,7 +389,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index 4f1917b..aa0e867 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -393,7 +393,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts index 894e4c7..f5ca9b1 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts @@ -395,7 +395,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts index ce33181..f3e9654 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts @@ -397,7 +397,8 @@ compatible = "amlogic, gxbb-eth-dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 - 0x0 0xc8834558 0x0 0xc>; + 0x0 0xc8834558 0x0 0xc + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1>; pinctrl-names = "external_eth_pins"; pinctrl-0 = <&external_eth_pins>; diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index 8d027c7..94a21ea 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -345,7 +345,7 @@ reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x8 0x0 0xc8834558 0x0 0xc - 0x0 0xc1104484 0x0 0x4>; + 0x0 0xc1104408 0x0 0x4>; interrupts = <0 8 1 0 9 1>; phy-mode= "rmii"; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index 6fe853f..2f16a18 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts @@ -220,7 +220,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts index 12a8100..07f49d4 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts @@ -189,7 +189,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts index 5690a3c..2908212 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -224,7 +224,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts index 6137141..cef7436 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -224,7 +224,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts index 3be2a11..4a39b65 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -224,7 +224,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts index e70112c..c9f1149 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts @@ -225,7 +225,7 @@ reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8 0x0 0xff634558 0x0 0xc - 0x0 0xffd01084 0x0 0x4>; + 0x0 0xffd01008 0x0 0x4>; interrupts = <0 8 1 0 9 1>; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c index a4cdb8e..8ed0238 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c @@ -228,6 +228,21 @@ static void __iomem *network_interface_setup(struct platform_device *pdev) } else { pin_ctl = devm_pinctrl_get_select(&pdev->dev, "eth_pins"); } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 3); + if (res) { + addr = devm_ioremap_resource(dev, res); + if (IS_ERR(addr)) { + dev_err(&pdev->dev, "Unable to map %d\n", __LINE__); + return NULL; + } + + ee_reset_base = addr; + pr_info(" ee eth reset:Addr = %p\n", ee_reset_base); + } else { + ee_reset_base = NULL; + dev_err(&pdev->dev, "Unable to get resource(%d)\n", __LINE__); + } pr_debug("Ethernet: pinmux setup ok\n"); return PREG_ETH_REG0; } @@ -512,11 +527,11 @@ static int meson6_dwmac_resume(struct device *dev) struct pinctrl *pin_ctrl; struct pinctrl_state *turnon_tes = NULL; pr_info("resuem inter = %d\n", is_internal_phy); - if ((is_internal_phy) && (support_mac_wol == 0)) { - if (ee_reset_base) - writel((1 << 11), (void __iomem *) - (unsigned long)ee_reset_base); + if (ee_reset_base) + writel((1 << 11), (void __iomem *) + (unsigned long)ee_reset_base); + if ((is_internal_phy) && (support_mac_wol == 0)) { pin_ctrl = devm_pinctrl_get(dev); if (IS_ERR_OR_NULL(pin_ctrl)) { pr_info("pinctrl is null\n"); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index f7e1a9a..f298627 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3673,12 +3673,6 @@ int stmmac_resume(struct device *dev) if (priv->phydev) phy_start(priv->phydev); -#ifdef TX_MONITOR - if (!ee_reset_base) { - stmmac_release(priv_monitor->dev); - stmmac_open(priv_monitor->dev); - } -#endif return 0; } EXPORT_SYMBOL_GPL(stmmac_resume); |