summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-12-19 19:03:07 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2019-11-10 23:04:47 +0000
commitb10af34fc08bdd1bd11c3dc34ce5e0cc5981bfb9 (patch)
tree853b18937df9926535a79fd85b2d2e610435b70a
parentadebd030a545d58ef620cf0306bb1b602dc81b86 (diff)
arm64: switch to using in-band negotiation with mvpp2x driver
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts4
-rw-r--r--drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index 8cedb9a223bb..75ca6248eba1 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -126,6 +126,7 @@
&cp0_mv_emac0 {
mac-address = [00 00 00 00 00 01];
+ managed = "in-band-status";
phy = <&phy0>;
phy-mode = "10gbase-kr";
phy-names = "comphy";
@@ -143,6 +144,7 @@
&cp1_mv_emac0 {
/* CPS Lane 4 */
mac-address = [00 00 00 00 00 04];
+ managed = "in-band-status";
phy = <&phy8>;
phy-mode = "10gbase-kr";
phy-names = "comphy";
@@ -156,6 +158,7 @@
&cp1_mv_emac2 {
/* CPS Lane 0 - J5 (Gigabit RJ45) */
mac-address = [00 00 00 00 00 05];
+ managed = "in-band-status";
phy = <&ge_phy>;
phy-mode = "sgmii";
phy-names = "comphy";
@@ -169,6 +172,7 @@
&cp1_mv_emac3 {
/* CPS Lane 5 - CON3,4 (SFP) */
mac-address = [00 00 00 00 00 06];
+ managed = "in-band-status";
phy-mode = "sgmii";
phy-names = "comphy";
phys = <&cp1_comphy5 2>;
diff --git a/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c b/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c
index c5f2005e9857..d31fafb22550 100644
--- a/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c
@@ -4440,7 +4440,7 @@ static int mv_pp2_init_emac_data(struct mv_pp2x_port *port,
phy_mode = of_get_phy_mode(emac_node);
- if (of_phy_is_fixed_link(emac_node)) {
+ if (0 && of_phy_is_fixed_link(emac_node)) {
port->mac_data.force_link = true;
port->mac_data.link = true;
fixed_link_node = of_get_child_by_name(emac_node, "fixed-link");