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: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index caf9c85..cbf75dd 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -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 */

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
index a35317d..b20c8e7 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
@@ -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>;
        };
 };

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
index 39a8e5e..5f6ed73 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
@@ -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>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
index 871f84b..079c274 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
@@ -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>;

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index 779cf16..33c1798 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -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>;

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
index 74bed79..72e9b0f 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
@@ -67,20 +67,20 @@
        sfp_cp0_eth0: sfp-cp0-eth0 {
                compatible = "sff,sfp";
                i2c-bus = <&sfpplus0_i2c>;
-               los-gpio = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio  = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>;
+               tx-disable-gpios = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios  = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>;
                maximum-power-milliwatt = <3000>;
        };
 
        sfp_cp1_eth0: sfp-cp1-eth0 {
                compatible = "sff,sfp";
                i2c-bus = <&sfpplus1_i2c>;
-               los-gpio = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio  = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>;
+               tx-disable-gpios = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios  = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>;
                maximum-power-milliwatt = <3000>;
        };
 

diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
index 1acd746..8e4ec24 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
@@ -78,9 +78,9 @@
                compatible = "sff,sfp";
                i2c-bus = <&cp0_i2c1>;
                mod-def0-gpios = <&expander0 3 GPIO_ACTIVE_LOW>;
-               los-gpio = <&expander0 15 GPIO_ACTIVE_HIGH>;
-               tx-disable-gpio = <&expander0 2 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&expander0 15 GPIO_ACTIVE_HIGH>;
+               tx-disable-gpios = <&expander0 2 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>;
                maximum-power-milliwatt = <3000>;
                status = "okay";
        };

diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
index 7e20987..85d7ce1 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
@@ -90,10 +90,10 @@
        cp0_sfp_eth0: sfp-eth@0 {
                compatible = "sff,sfp";
                i2c-bus = <&cp0_sfpp0_i2c>;
-               los-gpio = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&cp0_module_expander1 10 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&cp0_module_expander1 9 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&cp0_module_expander1 8 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&cp0_module_expander1 10 GPIO_ACTIVE_LOW>;
+               tx-disable-gpios = <&cp0_module_expander1 9 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios = <&cp0_module_expander1 8 GPIO_ACTIVE_HIGH>;
                /*
                 * SFP cages are unconnected on early PCBs because of an the I2C
                 * lanes not being connected. Prevent the port for being

diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
index b7fc241..ff8422f 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
@@ -37,10 +37,10 @@
        cp1_sfp_eth1: sfp-eth1 {
                compatible = "sff,sfp";
                i2c-bus = <&cp1_i2c0>;
-               los-gpio = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&cp1_gpio1 10 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&cp1_gpio1 9 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&cp1_gpio1 10 GPIO_ACTIVE_LOW>;
+               tx-disable-gpios = <&cp1_gpio1 9 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cp1_sfp_pins>;
                /*

diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
index 3f1795f..512a4fa 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
@@ -57,10 +57,10 @@
        cp2_sfp_eth0: sfp-eth0 {
                compatible = "sff,sfp";
                i2c-bus = <&cp2_sfpp0_i2c>;
-               los-gpio = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&cp2_module_expander1 10 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&cp2_module_expander1 9 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&cp2_module_expander1 8 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&cp2_module_expander1 10 GPIO_ACTIVE_LOW>;
+               tx-disable-gpios = <&cp2_module_expander1 9 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios = <&cp2_module_expander1 8 GPIO_ACTIVE_HIGH>;
                /*
                 * SFP cages are unconnected on early PCBs because of an the I2C
                 * lanes not being connected. Prevent the port for being