summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-12-08 10:08:41 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2020-10-12 21:52:07 +0100
commit1d87cbec242efec60e686f58a7b1c516dc72f4fd (patch)
treec1fb13053f55a6f1896a32eea685f0820a4dab2e
parentd1c14a521067a0b74dd1afc9eb083f4951168625 (diff)
ARM: dts: vf610-zii-dev-rev-c: add support for SFF modules
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm/boot/dts/vf610-zii-dev-rev-c.dts2
-rw-r--r--drivers/net/phy/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
index 9a348a854c7c..a3d933753433 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
@@ -79,7 +79,7 @@
port@9 {
reg = <9>;
- label = "lan10g";
+ label = "r9";
phy-mode = "xaui";
phy-handle = <&switch0phy9>;
};
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 1c5a10b672fc..6df679ed3616 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -290,7 +290,7 @@ comment "MII PHY device drivers"
config SFP
tristate "SFP cage support"
- depends on I2C && PHYLINK
+ depends on I2C
depends on HWMON || HWMON=n
select MDIO_I2C