diff --git a/arch/arm64/boot/dts/amlogic/meson-s6.dtsi b/arch/arm64/boot/dts/amlogic/meson-s6.dtsi index 9cdc924b4..64d0487f3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s6.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s6.dtsi @@ -699,17 +699,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>; @@ -722,19 +723,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 { @@ -1071,8 +1073,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 6dcf43789..a93b5554b 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts @@ -1449,6 +1449,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1456,9 +1459,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 adfa79273..e35f0e0c0 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 b9648ddae..b64f2936a 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq201_linux.dts @@ -1389,6 +1389,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1396,9 +1399,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 b8ad634f3..5ec19f7d3 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts @@ -1391,6 +1391,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1398,9 +1401,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 b4fe0c641..c1ecee56b 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts @@ -1401,6 +1401,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1408,9 +1411,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 d9e592e7e..9e115640f 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts @@ -1428,6 +1428,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1435,16 +1438,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 0b1187843..deba32aae 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_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 804436a7e..80a3d65e5 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts @@ -1420,6 +1420,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1427,14 +1430,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 130dbd1e4..8f603bbaa 100644 --- a/arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts +++ b/arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts @@ -1395,6 +1395,9 @@ }; /*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; @@ -1402,9 +1405,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>; diff --git a/arch/arm64/boot/dts/amlogic/sc2_s905x4_ah212_debian.dts b/arch/arm64/boot/dts/amlogic/sc2_s905x4_ah212_debian.dts index 9595cd6de..e037a27b5 100644 --- a/arch/arm64/boot/dts/amlogic/sc2_s905x4_ah212_debian.dts +++ b/arch/arm64/boot/dts/amlogic/sc2_s905x4_ah212_debian.dts @@ -922,12 +922,9 @@ compatible = "amlogic,tlc59116_led"; reg = <0x60>; status = "okay"; -<<<<<<< HEAD:arch/arm64/boot/dts/amlogic/sc2_s905x4_ah212_debian.dts -======= vcc5v-supply = <&vcc5v_reg>; reset_pin-gpios = <&gpio GPIOH_7 GPIO_ACTIVE_HIGH>; }; ->>>>>>> 7e53e9c214 (Audio: add the suspend/resume function for sy602x [1/1]):arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201_linux.dts led0 { default_colors = <0 0 0>; @@ -1613,14 +1610,32 @@ status = "okay"; }; +/*exphy setting*/ +&ext_mdio { + status = "okay"; +}; ðmac { pinctrl-0 = <ð_led_pins>; pinctrl-names = "default"; status = "okay"; - phy-handle = <&internal_ephy>; - phy-mode = "rmii"; + 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>; +//}; + &ir { status = "okay"; pinctrl-0 = <&remote_pins>;