Commit 4ce223e5 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Jakub Kicinski
Browse files

arch: arm64: dts: marvell: rename the sfp GPIO properties 



Rename the GPIO related sfp properties to include the preffered -gpios
suffix. Also, with this change the dtb_check will no longer complain
when trying to verify the DTS against the sff,sfp.yaml binding.

Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dfa2854c

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

+5 −5
Original line number Diff line number Diff line
@@ -100,11 +100,11 @@ 
	sfp: sfp {

		compatible = "sff,sfp";

		i2c-bus = <&i2c0>;

		los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;

		rate-select0-gpio = <&moxtet_sfp 5 GPIO_ACTIVE_HIGH>;

		los-gpios = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;

		rate-select0-gpios = <&moxtet_sfp 5 GPIO_ACTIVE_HIGH>;

		maximum-power-milliwatt = <3000>;



		/* enabled by U-Boot if SFP module is present */

arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts

+8 −8
Original line number Diff line number Diff line
@@ -65,20 +65,20 @@ 
	sfp_eth0: sfp-eth0 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c0>;

		los-gpio = <&gpiosb 2 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&gpiosb 3 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&gpiosb 4 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>;

		los-gpios = <&gpiosb 2 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&gpiosb 4 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&gpiosb 5 GPIO_ACTIVE_HIGH>;

		maximum-power-milliwatt = <3000>;

	};



	sfp_eth1: sfp-eth1 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c1>;

		los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>;

		los-gpios = <&gpiosb 7 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&gpiosb 8 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&gpiosb 9 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&gpiosb 10 GPIO_ACTIVE_HIGH>;

		maximum-power-milliwatt = <3000>;

	};

};

arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts

+8 −8
Original line number Diff line number Diff line
@@ -34,20 +34,20 @@ 
	sfp_eth0: sfp-eth0 {

		compatible = "sff,sfp";

		i2c-bus = <&cp0_i2c1>;

		los-gpio = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&sfp_gpio 2 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio  = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>;

		los-gpios = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sfp_gpio 2 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios  = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>;

	};



	/* SFP 1G */

	sfp_eth2: sfp-eth2 {

		compatible = "sff,sfp";

		i2c-bus = <&cp0_i2c0>;

		los-gpio = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&sfp_gpio 6 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio  = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>;

		los-gpios = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sfp_gpio 6 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios  = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>;

	};

};

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 
	sfp_cp0_eth0: sfp-cp0-eth0 {

		compatible = "sff,sfp";

		i2c-bus = <&cp0_i2c1>;

		mod-def0-gpio = <&cp0_gpio2 17 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&cp0_gpio2 17 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_sfp_present_pins &cp1_sfp_tx_disable_pins>;

		maximum-power-milliwatt = <2000>;

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ 
		/* CON15,16 - CPM lane 4 */

		compatible = "sff,sfp";

		i2c-bus = <&sfpp0_i2c>;

		los-gpio = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio  = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;

		los-gpios = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios  = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp1_sfpp0_pins>;

		maximum-power-milliwatt = <2000>;
@@ -78,10 +78,10 @@ 
		/* CON17,18 - CPS lane 4 */

		compatible = "sff,sfp";

		i2c-bus = <&sfpp1_i2c>;

		los-gpio = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&cp1_gpio1 10 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>;

		los-gpios = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&cp1_gpio1 10 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>;

		maximum-power-milliwatt = <2000>;
@@ -91,10 +91,10 @@ 
		/* CON13,14 - CPS lane 5 */

		compatible = "sff,sfp";

		i2c-bus = <&sfp_1g_i2c>;

		los-gpio = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>;

		mod-def0-gpio = <&cp0_gpio2 21 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&cp1_gpio1 24 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>;

		los-gpios = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&cp0_gpio2 21 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&cp1_gpio1 24 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>;

		maximum-power-milliwatt = <2000>;