[PATCH 2/6] realtek: re-enable sfp driver for ZyXEL GS1900-10HP

[Birger Koblitz]

ACK. Please apply.

Birger

On 09/03/2021 22:12, Bjørn Mork wrote:
> 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.
>
> Signed-off-by: Bjørn Mork <bjorn at mork.no>
> ---
>   .../realtek/dts/rtl8380_zyxel_gs1900-10hp.dts | 24 +++++--------------
>   1 file 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 92d0e25fc477..c16028788ea4 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 at 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 at 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;
> -			};
>   		};
>   	};
>   };