Re: [PATCH net-next v4 5/7] ARM64: dts: marvell: Fix some common switch mistakes

[Vladimir Oltean]

+Marek

On Wed, Oct 18, 2023 at 11:03:44AM +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.
> 
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> 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 9eab2bb22134..c69cb4e191e5 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -305,7 +305,7 @@ phy1: ethernet-phy@1 {
>  	};
>  
>  	/* switch nodes are enabled by U-Boot if modules are present */
> -	switch0@10 {
> +	switch@10 {

As the comment says: U-Boot
(https://elixir.bootlin.com/u-boot/latest/source/board/CZ.NIC/turris_mox/turris_mox.c#L728)
sets up status = "okay" for these nodes depending on the MOXTET
configuration. It doesn't look as if it's doing that by alias, just by
path ("%s/switch%i@%x").

I have a Turris MOX, please allow me some time to test if the node name
change is going to be significant and cause regressions. I expect the
answer to be yes (sadly).

>  		compatible = "marvell,mv88e6190";
>  		reg = <0x10>;
>  		dsa,member = <0 0>;
> @@ -430,7 +430,7 @@ port-sfp@a {
>  		};
>  	};
>  
> -	switch0@2 {
> +	switch@2 {
>  		compatible = "marvell,mv88e6085";
>  		reg = <0x2>;
>  		dsa,member = <0 0>;
> @@ -497,7 +497,7 @@ port@5 {
>  		};
>  	};
>  
> -	switch1@11 {
> +	switch@11 {
>  		compatible = "marvell,mv88e6190";
>  		reg = <0x11>;
>  		dsa,member = <0 1>;
> @@ -622,7 +622,7 @@ port-sfp@a {
>  		};
>  	};
>  
> -	switch1@2 {
> +	switch@2 {
>  		compatible = "marvell,mv88e6085";
>  		reg = <0x2>;
>  		dsa,member = <0 1>;
> @@ -689,7 +689,7 @@ port@5 {
>  		};
>  	};
>  
> -	switch2@12 {
> +	switch@12 {
>  		compatible = "marvell,mv88e6190";
>  		reg = <0x12>;
>  		dsa,member = <0 2>;
> @@ -805,7 +805,7 @@ port-sfp@a {
>  		};
>  	};
>  
> -	switch2@2 {
> +	switch@2 {
>  		compatible = "marvell,mv88e6085";
>  		reg = <0x2>;
>  		dsa,member = <0 2>;