Message ID | E1j7HyM-0004Zc-HY@rmk-PC.armlinux.org.uk (mailing list archive) |
---|---|
State | Mainlined |
Commit | 05abc6a5dec2a8c123a50235ecd1ad8d75ffa7b4 |
Headers | show |
Series | arm64: dts: mcbin: support 2W SFP modules | expand |
On Thu, Feb 27, 2020 at 12:08:58PM +0000, Russell King wrote: > Allow the SFP cages to be used with 2W SFP modules. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hi Russell, > Allow the SFP cages to be used with 2W SFP modules. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi > index 8a39908e584f..ba25650730c3 100644 > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi > @@ -71,6 +71,7 @@ > tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&cp1_sfpp0_pins>; > + maximum-power-milliwatt = <2000>; > }; > > sfp_eth1: sfp-eth1 { > @@ -83,6 +84,7 @@ > tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>; > + maximum-power-milliwatt = <2000>; > }; > > sfp_eth3: sfp-eth3 { > @@ -95,6 +97,7 @@ > tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>; > + maximum-power-milliwatt = <2000>; > }; > }; > > -- > 2.20.1 >
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index 8a39908e584f..ba25650730c3 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@ -71,6 +71,7 @@ tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp0_pins>; + maximum-power-milliwatt = <2000>; }; sfp_eth1: sfp-eth1 { @@ -83,6 +84,7 @@ tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>; + maximum-power-milliwatt = <2000>; }; sfp_eth3: sfp-eth3 { @@ -95,6 +97,7 @@ tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>; + maximum-power-milliwatt = <2000>; }; };
Allow the SFP cages to be used with 2W SFP modules. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +++ 1 file changed, 3 insertions(+)