4a24bd4db0
Resolve conflicted: - layerscape/patches-4.14/809-flexcan-support-layerscape.patch Refreshed all patches. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
29 lines
824 B
Diff
29 lines
824 B
Diff
From acdfcc7ef78c46baca1439a1cac5b73008abc672 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 16 May 2017 11:55:58 +0100
|
|
Subject: net: mvneta: hack fix phy_interface
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -427,6 +427,7 @@ struct mvneta_port {
|
|
u16 tx_ring_size;
|
|
u16 rx_ring_size;
|
|
|
|
+ phy_interface_t phy_interface;
|
|
struct device_node *dn;
|
|
unsigned int tx_csum_limit;
|
|
struct phylink *phylink;
|
|
@@ -4321,6 +4322,7 @@ static int mvneta_probe(struct platform_
|
|
|
|
pp = netdev_priv(dev);
|
|
spin_lock_init(&pp->lock);
|
|
+ pp->phy_interface = phy_mode;
|
|
pp->dn = dn;
|
|
|
|
pp->rxq_def = rxq_def;
|