From a0f2be810d86bed8f67709eb4e3c2282baffe813 Mon Sep 17 00:00:00 2001 From: qi duan Date: Tue, 3 Sep 2024 13:20:46 +0800 Subject: [PATCH] S6: dts: setting inphy for bl204 [1/1] PD#SWPL-183750 Problem: setting inphy for bl204 Solution: setting inphy for bl204 Verify: bl201/bl204 Change-Id: Ib6f6cea6b7654151ce9940ed478f61a64f959838 Signed-off-by: qi duan --- arch/arm64/boot/dts/amlogic/meson-s6.dtsi | 32 ++++++++-------- .../boot/dts/amlogic/s6_s905d5_bq201.dts | 8 ++++ .../boot/dts/amlogic/s6_s905d5_bq201_16g.dts | 8 ++++ .../dts/amlogic/s6_s905d5_bq201_linux.dts | 8 ++++ .../boot/dts/amlogic/s6_s905d5_bq208.dts | 8 ++++ .../boot/dts/amlogic/s6_s905d5_bq209.dts | 8 ++++ .../boot/dts/amlogic/s6_s905x5_bl201.dts | 10 +++++ .../boot/dts/amlogic/s6_s905x5_bl201_16g.dts | 8 ++++ .../dts/amlogic/s6_s905x5_bl201_linux.dts | 8 ++++ .../boot/dts/amlogic/s6_s905x5_bl204.dts | 38 ++++++++++++------- .../boot/dts/amlogic/s6_s905x5_bl208.dts | 10 ++++- .../boot/dts/amlogic/s6_s905x5_bl209.dts | 8 ++++ .../boot/dts/amlogic/s6_s905x5_bn201.dts | 8 ++++ 13 files changed, 131 insertions(+), 31 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-s6.dtsi b/arch/arm64/boot/dts/amlogic/meson-s6.dtsi index 338c8f8b4..fe4cabea7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s6.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s6.dtsi @@ -702,17 +702,18 @@ mdio-parent-bus = <&mdio0>; #address-cells = <1>; #size-cells = <0>; - // phy_pll_mode = <3>; + phy_pll_mode = <3>; phy_mode = <6>; tx_amp_src = <0xFE010330>; led_setting = <0x42>; ext_mdio: mdio@0 { + status = "disable"; reg = <0>; #address-cells = <1>; #size-cells = <0>; compatible = "snps,dwmac-mdio"; - external_phy: ethernet-phy@0 { + external_phy: ethernet_phy@0 { reg = <0>; max-speed = <1000>; @@ -725,19 +726,20 @@ }; }; -// int_mdio: mdio@1 { -// reg = <1>; -// #address-cells = <1>; -// #size-cells = <0>; + int_mdio: mdio@1 { + status = "disable"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; -// internal_ephy: ethernet_phy@8 { -// compatible = "ethernet-phy-id0180.3301", -// "ethernet-phy-ieee802.3-c22"; -// interrupts = ; -// reg = <8>; -// max-speed = <100>; -// }; -// }; + internal_ephy: ethernet_phy@8 { + compatible = "ethernet-phy-id0180.3301", + "ethernet-phy-ieee802.3-c22"; + interrupts = ; + reg = <8>; + max-speed = <100>; + }; + }; }; reset: reset-controller@2000 { @@ -1074,8 +1076,6 @@ tx-fifo-depth = <2048>; mboxes = <&mbox_fifo S6_REE2AO_ETH>; status = "disabled"; - internal_phy = <2>; - cali_val = <0x290000>; mdio0: mdio { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts index afcbb45ce..c8ff64504 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts @@ -1457,6 +1457,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1464,9 +1467,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_16g.dts b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_16g.dts index dc70d4245..e839e6dab 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_16g.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_16g.dts @@ -1458,6 +1458,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1465,9 +1468,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_linux.dts b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_linux.dts index 2c9d1400c..6bcca715a 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_linux.dts @@ -1456,6 +1456,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1463,9 +1466,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts index 53c7fae94..1f5d35a46 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts @@ -1393,6 +1393,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1400,9 +1403,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts index ff2dab121..99d999f27 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts @@ -1418,6 +1418,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1425,9 +1428,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts index a0688b6f1..3b2d2952f 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts @@ -1427,6 +1427,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1434,16 +1437,23 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; wol = <1>; mdns_wkup = <1>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; // phy-mode = "rmii"; // internal_phy = <1>; +// mac_wol = <1>; +// mdns_wkup = <1>; //}; &ir { diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_16g.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_16g.dts index d8c1cc168..c9141da14 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_16g.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_16g.dts @@ -1428,6 +1428,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1435,9 +1438,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_linux.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_linux.dts index 288ac0a32..20bb418fe 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201_linux.dts @@ -1412,6 +1412,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1419,9 +1422,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl204.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl204.dts index 7a1371514..e6fbf1ecc 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl204.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl204.dts @@ -1401,25 +1401,35 @@ }; /*exphy setting*/ +//&ext_mdio { +// status = "okay"; +//}; +//ðmac { +// pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; +// pinctrl-names = "default"; +// status = "okay"; +// phy-mode = "rgmii"; +// phy-handle = <&external_phy>; +// amlogic,tx-delay-ns = <2>; +// internal_phy = <2>; +// cali_val = <0x290000>; +// wol = <1>; +// mdns_wkup = <1>; +//}; + +/*inphy setting*/ +&int_mdio { + status = "okay"; +}; ðmac { - pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; - pinctrl-names = "default"; - status = "disabled"; - phy-mode = "rgmii"; - phy-handle = <&external_phy>; - amlogic,tx-delay-ns = <2>; + status = "okay"; + phy-handle = <&internal_ephy>; + phy-mode = "rmii"; + internal_phy = <1>; mac_wol = <1>; mdns_wkup = <1>; }; -/*inphy setting*/ -//ðmac { -// status = "okay"; -// phy-handle = <&internal_ephy>; -// phy-mode = "rmii"; -// internal_phy = <1>; -//}; - &ir { status = "okay"; pinctrl-0 = <&remote_pins>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts index 51acd8000..427289d6f 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts @@ -1419,6 +1419,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1426,14 +1429,19 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; // phy-mode = "rmii"; -// internal_phy = <1>; +// internal_phy = <1>; //}; &ir { diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts index 29c1b997d..f213eb74b 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts @@ -1394,6 +1394,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1401,9 +1404,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>; diff --git a/arch/arm64/boot/dts/amlogic/s6_s905x5_bn201.dts b/arch/arm64/boot/dts/amlogic/s6_s905x5_bn201.dts index 0323a3e53..f366a3888 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bn201.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bn201.dts @@ -1399,6 +1399,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1406,9 +1409,14 @@ phy-mode = "rgmii"; phy-handle = <&external_phy>; amlogic,tx-delay-ns = <2>; + internal_phy = <2>; + cali_val = <0x290000>; }; /*inphy setting*/ +//&int_mdio { +// status = "okay"; +//}; //ðmac { // status = "okay"; // phy-handle = <&internal_ephy>;