aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2021-03-13 17:45:51 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-04-18 12:06:31 +0200
commitec7cd3808de1f6a830c9e99c2f30b85d80cd4046 (patch)
tree3910de283b5767e0bb1f93ba03bfe57a8a963f99
parentd9b3edef4d84df70a62795cbad2012acc2ee6cab (diff)
downloadupstream-ec7cd3808de1f6a830c9e99c2f30b85d80cd4046.tar.gz
upstream-ec7cd3808de1f6a830c9e99c2f30b85d80cd4046.tar.bz2
upstream-ec7cd3808de1f6a830c9e99c2f30b85d80cd4046.zip
realtek: re-enable sfp driver for ZyXEL GS1900-10HP
There is no need to define a static link or a phy for the sfp ports. Using phy-mode and managed properties to describe the link to the sfp phy. We have to keep the now unconnected virtual "phys" because the switch driver uses their "phy-is-integrated" property to figure out which ports to enable as fibre ports. Acked-by: Birger Koblitz <mail@birger-koblitz.de> Signed-off-by: Bjørn Mork <bjorn@mork.no> (cherry picked from commit e8d391bd4650418182d96ca06ccd10d636efcbc3)
-rw-r--r--target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts24
1 files changed, 6 insertions, 18 deletions
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
index 92d0e25fc4..c16028788e 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
@@ -17,7 +17,7 @@
};
sfp0: sfp-p9 {
- compatible = "_sff,sfp";
+ compatible = "sff,sfp";
i2c-bus = <&i2c0>;
los-gpio = <&gpio1 27 GPIO_ACTIVE_HIGH>;
tx-fault-gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
@@ -36,7 +36,7 @@
};
sfp1: sfp-p10 {
- compatible = "_sff,sfp";
+ compatible = "sff,sfp";
i2c-bus = <&i2c1>;
los-gpio = <&gpio1 33 GPIO_ACTIVE_HIGH>;
tx-fault-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
@@ -55,29 +55,17 @@
port@24 {
reg = <24>;
label = "lan9";
- phy-mode = "rgmii-id";
- phy-handle = <&phy24>;
+ phy-mode = "1000base-x";
+ managed = "in-band-status";
sfp = <&sfp0>;
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- pause;
- };
};
port@26 {
reg = <26>;
label = "lan10";
- phy-mode = "rgmii-id";
- phy-handle = <&phy26>;
+ phy-mode = "1000base-x";
+ managed = "in-band-status";
sfp = <&sfp1>;
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- pause;
- };
};
};
};