summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-12-08 10:08:41 +0000
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2024-05-09 18:17:43 +0100
commit27adb5885ad5fa7669479235c1ed37697fe85319 (patch)
treed886c858dc41cc805b1884901adaf435ddf9e1c0
parentfc4dfd5f64ec1321ecb6489b7a40f2cb3110edff (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/nxp/vf/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/nxp/vf/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-c.dts
index 0e10283a4cb1..8cf3328beb83 100644
--- a/arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/boot/dts/nxp/vf/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 9e2672800f0b..d37f4cf05a07 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -70,7 +70,7 @@ config RUST_PHYLIB_ABSTRACTIONS
config SFP
tristate "SFP cage support"
- depends on I2C && PHYLINK
+ depends on I2C
depends on HWMON || HWMON=n
select MDIO_I2C