lkml.org 
[lkml]   [2023]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH net-next v5 4/7] ARM: dts: nxp: Fix some common switch mistakes
    Fix some errors in the Marvell MV88E6xxx switch descriptions:
    - switch0@0 is not OK, should be ethernet-switch@0
    - ports should be ethernet-ports
    - port should be ethernet-port
    - phy should be ethernet-phy

    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts | 14 ++---
    arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts | 70 ++++++++++++------------
    arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts | 18 +++---
    arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts | 20 +++----
    arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts | 18 +++---
    5 files changed, 70 insertions(+), 70 deletions(-)

    diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
    index 1a19aec8957b..7e72f860c3c5 100644
    --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
    +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
    @@ -162,7 +162,7 @@ mdio1: mdio {
    suppress-preamble;
    status = "okay";

    - switch0: switch0@0 {
    + switch0: ethernet-switch@0 {
    compatible = "marvell,mv88e6085";
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_switch>;
    @@ -173,26 +173,26 @@ switch0: switch0@0 {
    interrupt-controller;
    #interrupt-cells = <2>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@0 {
    + ethernet-port@0 {
    reg = <0>;
    label = "eth_cu_1000_1";
    };

    - port@1 {
    + ethernet-port@1 {
    reg = <1>;
    label = "eth_cu_1000_2";
    };

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "eth_cu_1000_3";
    };

    - port@5 {
    + ethernet-port@5 {
    reg = <5>;
    label = "eth_fc_1000_1";
    phy-mode = "1000base-x";
    @@ -200,7 +200,7 @@ port@5 {
    sfp = <&sff>;
    };

    - port@6 {
    + ethernet-port@6 {
    reg = <6>;
    phy-mode = "rmii";
    ethernet = <&fec1>;
    diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
    index df1335492a19..77492eeea450 100644
    --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
    +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
    @@ -47,17 +47,17 @@ mdio_mux_1: mdio@1 {
    #address-cells = <1>;
    #size-cells = <0>;

    - switch0: switch0@0 {
    + switch0: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    reg = <0>;
    dsa,member = <0 0>;
    eeprom-length = <65536>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@0 {
    + ethernet-port@0 {
    reg = <0>;
    phy-mode = "rmii";
    ethernet = <&fec1>;
    @@ -68,37 +68,37 @@ fixed-link {
    };
    };

    - port@1 {
    + ethernet-port@1 {
    reg = <1>;
    label = "aib2main_1";
    };

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "aib2main_2";
    };

    - port@3 {
    + ethernet-port@3 {
    reg = <3>;
    label = "eth_cu_1000_5";
    };

    - port@4 {
    + ethernet-port@4 {
    reg = <4>;
    label = "eth_cu_1000_6";
    };

    - port@5 {
    + ethernet-port@5 {
    reg = <5>;
    label = "eth_cu_1000_4";
    };

    - port@6 {
    + ethernet-port@6 {
    reg = <6>;
    label = "eth_cu_1000_7";
    };

    - port@7 {
    + ethernet-port@7 {
    reg = <7>;
    label = "modem_pic";

    @@ -108,7 +108,7 @@ fixed-link {
    };
    };

    - switch0port10: port@10 {
    + switch0port10: ethernet-port@10 {
    reg = <10>;
    label = "dsa";
    phy-mode = "xgmii";
    @@ -130,32 +130,32 @@ mdio_mux_2: mdio@2 {
    #address-cells = <1>;
    #size-cells = <0>;

    - switch1: switch1@0 {
    + switch1: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    reg = <0>;
    dsa,member = <0 1>;
    eeprom-length = <65536>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@1 {
    + ethernet-port@1 {
    reg = <1>;
    label = "eth_cu_1000_3";
    };

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "eth_cu_100_2";
    };

    - port@3 {
    + ethernet-port@3 {
    reg = <3>;
    label = "eth_cu_100_3";
    };

    - switch1port9: port@9 {
    + switch1port9: ethernet-port@9 {
    reg = <9>;
    label = "dsa";
    phy-mode = "xgmii";
    @@ -168,7 +168,7 @@ fixed-link {
    };
    };

    - switch1port10: port@10 {
    + switch1port10: ethernet-port@10 {
    reg = <10>;
    label = "dsa";
    phy-mode = "xgmii";
    @@ -188,17 +188,17 @@ mdio_mux_4: mdio@4 {
    #address-cells = <1>;
    #size-cells = <0>;

    - switch2: switch2@0 {
    + switch2: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    reg = <0>;
    dsa,member = <0 2>;
    eeprom-length = <65536>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "eth_fc_1000_2";
    phy-mode = "1000base-x";
    @@ -206,7 +206,7 @@ port@2 {
    sfp = <&sff1>;
    };

    - port@3 {
    + ethernet-port@3 {
    reg = <3>;
    label = "eth_fc_1000_3";
    phy-mode = "1000base-x";
    @@ -214,7 +214,7 @@ port@3 {
    sfp = <&sff2>;
    };

    - port@4 {
    + ethernet-port@4 {
    reg = <4>;
    label = "eth_fc_1000_4";
    phy-mode = "1000base-x";
    @@ -222,7 +222,7 @@ port@4 {
    sfp = <&sff3>;
    };

    - port@5 {
    + ethernet-port@5 {
    reg = <5>;
    label = "eth_fc_1000_5";
    phy-mode = "1000base-x";
    @@ -230,7 +230,7 @@ port@5 {
    sfp = <&sff4>;
    };

    - port@6 {
    + ethernet-port@6 {
    reg = <6>;
    label = "eth_fc_1000_6";
    phy-mode = "1000base-x";
    @@ -238,7 +238,7 @@ port@6 {
    sfp = <&sff5>;
    };

    - port@7 {
    + ethernet-port@7 {
    reg = <7>;
    label = "eth_fc_1000_7";
    phy-mode = "1000base-x";
    @@ -246,7 +246,7 @@ port@7 {
    sfp = <&sff6>;
    };

    - port@9 {
    + ethernet-port@9 {
    reg = <9>;
    label = "eth_fc_1000_1";
    phy-mode = "1000base-x";
    @@ -254,7 +254,7 @@ port@9 {
    sfp = <&sff0>;
    };

    - switch2port10: port@10 {
    + switch2port10: ethernet-port@10 {
    reg = <10>;
    label = "dsa";
    phy-mode = "2500base-x";
    @@ -276,17 +276,17 @@ mdio_mux_8: mdio@8 {
    #address-cells = <1>;
    #size-cells = <0>;

    - switch3: switch3@0 {
    + switch3: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    reg = <0>;
    dsa,member = <0 3>;
    eeprom-length = <65536>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "eth_fc_1000_8";
    phy-mode = "1000base-x";
    @@ -294,7 +294,7 @@ port@2 {
    sfp = <&sff7>;
    };

    - port@3 {
    + ethernet-port@3 {
    reg = <3>;
    label = "eth_fc_1000_9";
    phy-mode = "1000base-x";
    @@ -302,7 +302,7 @@ port@3 {
    sfp = <&sff8>;
    };

    - port@4 {
    + ethernet-port@4 {
    reg = <4>;
    label = "eth_fc_1000_10";
    phy-mode = "1000base-x";
    @@ -310,7 +310,7 @@ port@4 {
    sfp = <&sff9>;
    };

    - switch3port9: port@9 {
    + switch3port9: ethernet-port@9 {
    reg = <9>;
    label = "dsa";
    phy-mode = "2500base-x";
    @@ -322,7 +322,7 @@ fixed-link {
    };
    };

    - switch3port10: port@10 {
    + switch3port10: ethernet-port@10 {
    reg = <10>;
    label = "dsa";
    phy-mode = "xgmii";
    diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
    index 1461804ecaea..2a490464660c 100644
    --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
    +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
    @@ -123,7 +123,7 @@ mdio1: mdio {
    suppress-preamble;
    status = "okay";

    - switch0: switch0@0 {
    + switch0: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    pinctrl-0 = <&pinctrl_gpio_switch0>;
    pinctrl-names = "default";
    @@ -134,11 +134,11 @@ switch0: switch0@0 {
    interrupt-controller;
    #interrupt-cells = <2>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@0 {
    + ethernet-port@0 {
    reg = <0>;
    phy-mode = "rmii";
    ethernet = <&fec1>;
    @@ -149,32 +149,32 @@ fixed-link {
    };
    };

    - port@1 {
    + ethernet-port@1 {
    reg = <1>;
    label = "eth_cu_1000_1";
    };

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "eth_cu_1000_2";
    };

    - port@3 {
    + ethernet-port@3 {
    reg = <3>;
    label = "eth_cu_1000_3";
    };

    - port@4 {
    + ethernet-port@4 {
    reg = <4>;
    label = "eth_cu_1000_4";
    };

    - port@5 {
    + ethernet-port@5 {
    reg = <5>;
    label = "eth_cu_1000_5";
    };

    - port@6 {
    + ethernet-port@6 {
    reg = <6>;
    label = "eth_cu_1000_6";
    };
    diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
    index 463c2452b9b7..078d8699e16d 100644
    --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
    +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
    @@ -112,7 +112,7 @@ mdio1: mdio {
    suppress-preamble;
    status = "okay";

    - switch0: switch0@0 {
    + switch0: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    pinctrl-0 = <&pinctrl_gpio_switch0>;
    pinctrl-names = "default";
    @@ -123,11 +123,11 @@ switch0: switch0@0 {
    interrupt-controller;
    #interrupt-cells = <2>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@0 {
    + ethernet-port@0 {
    reg = <0>;
    phy-mode = "rmii";
    ethernet = <&fec1>;
    @@ -138,27 +138,27 @@ fixed-link {
    };
    };

    - port@1 {
    + ethernet-port@1 {
    reg = <1>;
    label = "eth_cu_100_3";
    };

    - port@5 {
    + ethernet-port@5 {
    reg = <5>;
    label = "eth_cu_1000_4";
    };

    - port@6 {
    + ethernet-port@6 {
    reg = <6>;
    label = "eth_cu_1000_5";
    };

    - port@8 {
    + ethernet-port@8 {
    reg = <8>;
    label = "eth_cu_1000_1";
    };

    - port@9 {
    + ethernet-port@9 {
    reg = <9>;
    label = "eth_cu_1000_2";
    phy-handle = <&phy9>;
    @@ -167,12 +167,12 @@ port@9 {
    };
    };

    - mdio1 {
    + mdio-external {
    compatible = "marvell,mv88e6xxx-mdio-external";
    #address-cells = <1>;
    #size-cells = <0>;

    - phy9: phy9@0 {
    + phy9: ethernet-phy@0 {
    compatible = "ethernet-phy-ieee802.3-c45";
    pinctrl-0 = <&pinctrl_gpio_phy9>;
    pinctrl-names = "default";
    diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
    index f5ae0d5de315..22c8f44390a9 100644
    --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
    +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
    @@ -137,7 +137,7 @@ mdio1: mdio {
    suppress-preamble;
    status = "okay";

    - switch0: switch0@0 {
    + switch0: ethernet-switch@0 {
    compatible = "marvell,mv88e6190";
    pinctrl-0 = <&pinctrl_gpio_switch0>;
    pinctrl-names = "default";
    @@ -148,11 +148,11 @@ switch0: switch0@0 {
    interrupt-controller;
    #interrupt-cells = <2>;

    - ports {
    + ethernet-ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - port@0 {
    + ethernet-port@0 {
    reg = <0>;
    phy-mode = "rmii";
    ethernet = <&fec1>;
    @@ -163,32 +163,32 @@ fixed-link {
    };
    };

    - port@1 {
    + ethernet-port@1 {
    reg = <1>;
    label = "eth_cu_1000_1";
    };

    - port@2 {
    + ethernet-port@2 {
    reg = <2>;
    label = "eth_cu_1000_2";
    };

    - port@3 {
    + ethernet-port@3 {
    reg = <3>;
    label = "eth_cu_1000_3";
    };

    - port@4 {
    + ethernet-port@4 {
    reg = <4>;
    label = "eth_cu_1000_4";
    };

    - port@5 {
    + ethernet-port@5 {
    reg = <5>;
    label = "eth_cu_1000_5";
    };

    - port@6 {
    + ethernet-port@6 {
    reg = <6>;
    label = "eth_cu_1000_6";
    };
    --
    2.34.1

    \
     
     \ /
      Last update: 2023-10-23 09:20    [W:3.266 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site