ETH: add eth reset bit when resume. [1/1]
authorqi duan <qi.duan@amlogic.com>
Wed, 4 Sep 2019 09:34:59 +0000 (05:34 -0400)
committerTao Zeng <tao.zeng@amlogic.com>
Mon, 16 Sep 2019 08:17:10 +0000 (01:17 -0700)
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:
arch/arm/boot/dts/amlogic/atom.dts
arch/arm/boot/dts/amlogic/axg_a113d_skt.dts
arch/arm/boot/dts/amlogic/axg_s400.dts
arch/arm/boot/dts/amlogic/axg_s400_v03.dts
arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts
arch/arm/boot/dts/amlogic/axg_s400_v03gva_sbr.dts
arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts
arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts
arch/arm/boot/dts/amlogic/gxl_p212_1g.dts
arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts
arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p281_1g.dts
arch/arm/boot/dts/amlogic/gxl_p281_2g.dts
arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts
arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts
arch/arm/boot/dts/amlogic/gxl_skt.dts
arch/arm/boot/dts/amlogic/gxm_q200_2g.dts
arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
arch/arm/boot/dts/amlogic/mesontxl.dtsi
arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
arch/arm64/boot/dts/amlogic/atom.dts
arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
arch/arm64/boot/dts/amlogic/axg_s400.dts
arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts
arch/arm64/boot/dts/amlogic/axg_s400_v03gva_sbr.dts
arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts
arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
arch/arm64/boot/dts/amlogic/axg_s410.dts
arch/arm64/boot/dts/amlogic/axg_s410_v03.dts
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts
arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts
arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts
arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts
arch/arm64/boot/dts/amlogic/gxl_skt.dts
arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
arch/arm64/boot/dts/amlogic/mesontxl.dtsi
arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index ba5bce1..0062db5 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index ff4f679..3670fcd 100644 (file)
                        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>;
index 0b304c1..895c378 100644 (file)
        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>;
index 3ac9b55..0395be7 100644 (file)
        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>;
index 40b0c41..b710d87 100644 (file)
        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>;
index 5f32dbb..6a75293 100644 (file)
        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>;
index b6a7d48..34dc3d3 100644 (file)
        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>;
index b5f4c1f..d701064 100644 (file)
        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>;
index b281647..7060975 100644 (file)
                        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>;
index 12f0013..693e28b 100644 (file)
                        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>;
index 0ee49ed..5efed17 100644 (file)
                        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>;
index 839ef9e..5d0e52d 100644 (file)
                        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>;
index 74ac46c..ad58950 100644 (file)
                        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>;
index fb75ada..8960aee 100644 (file)
                        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>;
index 9418632..4f8d638 100644 (file)
                        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>;
index 1da54da..dc9f070 100644 (file)
                        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>;
index ab65fb6..25b0775 100644 (file)
                        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>;
index bcbc10a..99776f3 100644 (file)
                        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>;
index b2be483..7164209 100644 (file)
                        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>;
index c217fe4..fd58d2e 100644 (file)
                        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>;
index 200bebe..245c1dc 100644 (file)
                        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>;
index 5294a4b..6983969 100644 (file)
                        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>;
index 57ace29..a53d507 100644 (file)
                        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>;
index 062b3dd..8b6ed4c 100644 (file)
                        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>;
index 7545166..4945d45 100644 (file)
                        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>;
index cdb27c8..0e2a52a 100644 (file)
                        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>;
index 2f447c3..7570280 100644 (file)
                        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>;
index c8309f7..ed45ac7 100644 (file)
                        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>;
index 5ace41a..ce15065 100644 (file)
                        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>;
index 8b4bb51..6e30ad5 100644 (file)
                        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>;
index b457dbe..97f5813 100644 (file)
                        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>;
index 9b83e6f..3a5234e 100644 (file)
                        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>;
index 6d73a6f..4402966 100644 (file)
                        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>;
index 1c876ec..e1e8565 100644 (file)
                reg = <0xc9410000 0x10000
                        0xc8834540 0x8
                        0xc8834558 0xc
-                       0xc1104484 0x4>;
+                       0xc1104408 0x4>;
                interrupts = <0 8 1
                                                  0 9 1>;
                phy-mode= "rmii";
index 36237b6..9603ac4 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index b233a7c..c08f69d 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index 854ff2b..7f904db 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index 8dbc397..ea73ed9 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index 25b4872..04ad8c9 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index 68165ac..f745e7f 100644 (file)
                reg = <0xff3f0000 0x10000
                        0xff634540 0x8
                        0xff634558 0xc
-                       0xffd01084 0x4>;
+                       0xffd01008 0x4>;
                interrupts = <0 8 1
                                0 9 1>;
 
index 34ba9c2..363642f 100644 (file)
                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>;
 
index b49cb62..3cbf2c4 100644 (file)
                        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>;
index bf6c537..203fcef 100644 (file)
        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>;
index 6cf5026..d6d9a5f 100644 (file)
        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>;
index 0dda975..8e0ea1c 100644 (file)
        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>;
index fc764d8..1220281 100644 (file)
        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>;
index ed16bf5..53612e4 100644 (file)
        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>;
index c21e8ed..031618b 100644 (file)
        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>;
index 00da043..517acb0 100644 (file)
        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>;
index 4ddfb1a..4984cf6 100644 (file)
        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>;
index 2057f01..8ff67ab 100644 (file)
                        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>;
index c55cb7f..1ecb305 100644 (file)
                        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>;
index 0ae1001..27f6142 100644 (file)
                        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>;
index f6f657c..e7354f7 100644 (file)
                        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>;
index e36ed5e..0f76f4e 100644 (file)
                        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>;
index d84762b..bebe846 100644 (file)
                        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>;
index 1444c1a..65b9e44 100644 (file)
                        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>;
index 264d6fe..d2e677a 100644 (file)
                        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>;
index 482e418..d3ac6f0 100644 (file)
                        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>;
index e08cbd8..282ea43 100644 (file)
                        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>;
index c8e95a0..160e61e 100644 (file)
                        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>;
index 4881fc3..f3737e9 100644 (file)
                        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>;
index 808726c..4d28be7 100644 (file)
                        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>;
index d566dc7..6715bbd 100644 (file)
                        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>;
index 3c0c432..2af5de5 100644 (file)
                        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>;
index f76a869..e17e8c3 100644 (file)
                        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>;
index 60015a4..e587fa2 100644 (file)
                        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>;
index 52e9826..a0d4fbf 100644 (file)
                        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>;
index 1ecf233..5b002f8 100644 (file)
                        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>;
index 916f139..7446f36 100644 (file)
                        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>;
index 8508758..ddd45d5 100644 (file)
                        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>;
index b781051..2976a90 100644 (file)
                        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>;
index 1fe4844..9fc1602 100644 (file)
                        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>;
index 4f1917b..aa0e867 100644 (file)
                        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>;
index 894e4c7..f5ca9b1 100644 (file)
                        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>;
index ce33181..f3e9654 100644 (file)
                        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>;
index 8d027c7..94a21ea 100644 (file)
                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";
index 6fe853f..2f16a18 100644 (file)
                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>;
 
index 12a8100..07f49d4 100644 (file)
                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>;
 
index 5690a3c..2908212 100644 (file)
                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>;
 
index 6137141..cef7436 100644 (file)
                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>;
 
index 3be2a11..4a39b65 100644 (file)
                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>;
 
index e70112c..c9f1149 100644 (file)
                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>;
 
index a4cdb8e..8ed0238 100644 (file)
@@ -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");
index f7e1a9a..f298627 100644 (file)
@@ -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);