lkml.org 
[lkml]   [2023]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH net-next v3 4/6] ARM: dts: marvell: Fix some common switch mistakes
    Fix some errors in the Marvell MV88E6xxx switch descriptions:
    - The top node had no address size or cells.
    - switch0@0 is not OK, should be switch@0.
    - port@a is not normal port naming, use decimal port@10.
    - The ports node should have port@0 etc children, no
    plural "ports".

    This serves as an example of fixes needed for introducing a
    schema for the bindings, but the patch can simply be applied.

    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    arch/arm/boot/dts/marvell/armada-370-rd.dts | 2 --
    .../arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts | 6 ++----
    arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts | 2 +-
    arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts | 2 +-
    arch/arm/boot/dts/marvell/armada-385-linksys.dtsi | 2 --
    arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts | 16 +++++++---------
    arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 2 --
    arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts | 2 --
    8 files changed, 11 insertions(+), 23 deletions(-)

    diff --git a/arch/arm/boot/dts/marvell/armada-370-rd.dts b/arch/arm/boot/dts/marvell/armada-370-rd.dts
    index b459a670f615..e3a1834986ee 100644
    --- a/arch/arm/boot/dts/marvell/armada-370-rd.dts
    +++ b/arch/arm/boot/dts/marvell/armada-370-rd.dts
    @@ -151,8 +151,6 @@ led@0 {

    switch: switch@10 {
    compatible = "marvell,mv88e6085";
    - #address-cells = <1>;
    - #size-cells = <0>;
    reg = <0x10>;
    interrupt-controller;
    #interrupt-cells = <2>;
    diff --git a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
    index f4c4b213ef4e..cf37f53ec070 100644
    --- a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
    +++ b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
    @@ -79,14 +79,12 @@ &mdio {

    switch@0 {
    compatible = "marvell,mv88e6190";
    - #address-cells = <1>;
    #interrupt-cells = <2>;
    interrupt-controller;
    interrupt-parent = <&gpio1>;
    interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
    pinctrl-0 = <&switch_interrupt_pins>;
    pinctrl-names = "default";
    - #size-cells = <0>;
    reg = <0>;

    mdio {
    @@ -214,12 +212,12 @@ port@9 {
    reg = <9>;
    };

    - port@a {
    + port@10 {
    /* 88X3310P external phy */
    label = "lan10";
    phy-handle = <&phy2>;
    phy-mode = "xaui";
    - reg = <0xa>;
    + reg = <10>;
    };
    };
    };
    diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
    index 1990f7d0cc79..1be0419f8f3e 100644
    --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
    +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
    @@ -7,7 +7,7 @@ / {
    };

    &mdio {
    - switch0: switch0@4 {
    + switch0: switch@4 {
    compatible = "marvell,mv88e6190";
    reg = <4>;
    pinctrl-names = "default";
    diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
    index b795ad573891..6ec536222bfb 100644
    --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
    +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
    @@ -11,7 +11,7 @@ &sfp0 {
    };

    &mdio {
    - switch0: switch0@4 {
    + switch0: switch@4 {
    compatible = "marvell,mv88e6085";
    reg = <4>;
    pinctrl-names = "default";
    diff --git a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
    index fc8216fd9f60..63a0bc9455ca 100644
    --- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
    +++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
    @@ -160,8 +160,6 @@ &mdio {

    switch@0 {
    compatible = "marvell,mv88e6085";
    - #address-cells = <1>;
    - #size-cells = <0>;
    reg = <0>;

    ports {
    diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
    index 2d8d319bec83..8c69dbd6a2c7 100644
    --- a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
    +++ b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
    @@ -439,8 +439,6 @@ switch@10 {
    pinctrl-names = "default";
    pinctrl-0 = <&swint_pins>;
    compatible = "marvell,mv88e6085";
    - #address-cells = <1>;
    - #size-cells = <0>;

    dsa,member = <0 0>;
    reg = <0x10>;
    @@ -452,32 +450,32 @@ ports {
    #address-cells = <1>;
    #size-cells = <0>;

    - ports@0 {
    + port@0 {
    reg = <0>;
    label = "lan0";
    };

    - ports@1 {
    + port@1 {
    reg = <1>;
    label = "lan1";
    };

    - ports@2 {
    + port@2 {
    reg = <2>;
    label = "lan2";
    };

    - ports@3 {
    + port@3 {
    reg = <3>;
    label = "lan3";
    };

    - ports@4 {
    + port@4 {
    reg = <4>;
    label = "lan4";
    };

    - ports@5 {
    + port@5 {
    reg = <5>;
    ethernet = <&eth1>;
    phy-mode = "rgmii-id";
    @@ -488,7 +486,7 @@ fixed-link {
    };
    };

    - ports@6 {
    + port@6 {
    reg = <6>;
    ethernet = <&eth0>;
    phy-mode = "rgmii-id";
    diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
    index 32c569df142f..ab46903580aa 100644
    --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
    +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
    @@ -94,8 +94,6 @@ &mdio {

    switch@4 {
    compatible = "marvell,mv88e6085";
    - #address-cells = <1>;
    - #size-cells = <0>;
    reg = <4>;
    pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;
    pinctrl-names = "default";
    diff --git a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
    index 7a0614fd0c93..2a5518c73bff 100644
    --- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
    +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
    @@ -267,8 +267,6 @@ &mdio {

    switch@0 {
    compatible = "marvell,mv88e6085";
    - #address-cells = <1>;
    - #size-cells = <0>;
    reg = <0>;

    ports {
    --
    2.34.1

    \
     
     \ /
      Last update: 2023-10-16 11:15    [W:2.310 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site