[net-next,v4,3/7] ARM: dts: marvell: Fix some common switch mistakes
Commit Message
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.
- 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 | 2 --
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, 9 insertions(+), 21 deletions(-)
Comments
On Wed, Oct 18, 2023 at 11:03:42AM +0200, Linus Walleij wrote:
> 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.
> - 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>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
On Wed, Oct 18, 2023 at 11:03:42AM +0200, Linus Walleij wrote:
> 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.
> - 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.
In patch 2, you mention that things should be named ethernet-switch and
ethernet-port. As you're renaming the nodes in this patch, wouldn't it
make sense to use those names instead now, rather than at some point in
the future a patch that converts to these names?
Thanks.
On Thu, Oct 19, 2023 at 12:04:46PM +0100, Russell King (Oracle) wrote:
> On Wed, Oct 18, 2023 at 11:03:42AM +0200, Linus Walleij wrote:
> > 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.
> > - 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.
>
> In patch 2, you mention that things should be named ethernet-switch and
> ethernet-port. As you're renaming the nodes in this patch, wouldn't it
> make sense to use those names instead now, rather than at some point in
> the future a patch that converts to these names?
I agree, and I was wondering the same thing.
@@ -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>;
@@ -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 {
@@ -7,7 +7,7 @@ / {
};
&mdio {
- switch0: switch0@4 {
+ switch0: switch@4 {
compatible = "marvell,mv88e6190";
reg = <4>;
pinctrl-names = "default";
@@ -11,7 +11,7 @@ &sfp0 {
};
&mdio {
- switch0: switch0@4 {
+ switch0: switch@4 {
compatible = "marvell,mv88e6085";
reg = <4>;
pinctrl-names = "default";
@@ -160,8 +160,6 @@ &mdio {
switch@0 {
compatible = "marvell,mv88e6085";
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
ports {
@@ -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 = <ð1>;
phy-mode = "rgmii-id";
@@ -488,7 +486,7 @@ fixed-link {
};
};
- ports@6 {
+ port@6 {
reg = <6>;
ethernet = <ð0>;
phy-mode = "rgmii-id";
@@ -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";
@@ -267,8 +267,6 @@ &mdio {
switch@0 {
compatible = "marvell,mv88e6085";
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
ports {