[PATCH] arm: mvebu: turris_mox: Set "sfp" label in eth1 DT node when only Mox SFP is detected

[PATCH] arm: mvebu: turris_mox: Set "sfp" label in eth1 DT node when only Mox SFP is detected

[Pali Rohár]

When Mox SFP module is connected after Topaz or Peridot module then port DT
node already contains "sfp" label. But Mox SFP module can be connected also
without Topaz or Peridot module in which case it is connected directly into
he eth1 DT node, which is without any label. So add "sfp" label into eth1
DT node in this case.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 board/CZ.NIC/turris_mox/turris_mox.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 28259e71405f..3dbd68e52366 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -821,6 +821,11 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 						 "sgmii");
 			if (res < 0)
 				return res;
+
+			res = fdt_setprop_string(blob, node, "label",
+						 "sfp");
+			if (res < 0)
+				return res;
 		}
 
 		res = fdt_status_okay_by_compatible(blob, "cznic,moxtet-gpio");
-- 
2.20.1

Re: [PATCH] arm: mvebu: turris_mox: Set "sfp" label in eth1 DT node when only Mox SFP is detected

[Marek Behún]

On Wed, 10 Aug 2022 12:54:11 +0200
Pali Rohár <pali@kernel.org> wrote:

> When Mox SFP module is connected after Topaz or Peridot module then port DT
> node already contains "sfp" label. But Mox SFP module can be connected also
> without Topaz or Peridot module in which case it is connected directly into
> he eth1 DT node, which is without any label. So add "sfp" label into eth1
> DT node in this case.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Marek Behún <kabel@kernel.org>

Re: [PATCH] arm: mvebu: turris_mox: Set "sfp" label in eth1 DT node when only Mox SFP is detected

[Stefan Roese]

On 10.08.22 12:54, Pali Rohár wrote:
> When Mox SFP module is connected after Topaz or Peridot module then port DT
> node already contains "sfp" label. But Mox SFP module can be connected also
> without Topaz or Peridot module in which case it is connected directly into
> he eth1 DT node, which is without any label. So add "sfp" label into eth1
> DT node in this case.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
> ---
>   board/CZ.NIC/turris_mox/turris_mox.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
> index 28259e71405f..3dbd68e52366 100644
> --- a/board/CZ.NIC/turris_mox/turris_mox.c
> +++ b/board/CZ.NIC/turris_mox/turris_mox.c
> @@ -821,6 +821,11 @@ int ft_board_setup(void *blob, struct bd_info *bd)
>   						 "sgmii");
>   			if (res < 0)
>   				return res;
> +
> +			res = fdt_setprop_string(blob, node, "label",
> +						 "sfp");
> +			if (res < 0)
> +				return res;
>   		}
>   
>   		res = fdt_status_okay_by_compatible(blob, "cznic,moxtet-gpio");

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH] arm: mvebu: turris_mox: Set "sfp" label in eth1 DT node when only Mox SFP is detected

[Stefan Roese]

On 10.08.22 12:54, Pali Rohár wrote:
> When Mox SFP module is connected after Topaz or Peridot module then port DT
> node already contains "sfp" label. But Mox SFP module can be connected also
> without Topaz or Peridot module in which case it is connected directly into
> he eth1 DT node, which is without any label. So add "sfp" label into eth1
> DT node in this case.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   board/CZ.NIC/turris_mox/turris_mox.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
> index 28259e71405f..3dbd68e52366 100644
> --- a/board/CZ.NIC/turris_mox/turris_mox.c
> +++ b/board/CZ.NIC/turris_mox/turris_mox.c
> @@ -821,6 +821,11 @@ int ft_board_setup(void *blob, struct bd_info *bd)
>   						 "sgmii");
>   			if (res < 0)
>   				return res;
> +
> +			res = fdt_setprop_string(blob, node, "label",
> +						 "sfp");
> +			if (res < 0)
> +				return res;
>   		}
>   
>   		res = fdt_status_okay_by_compatible(blob, "cznic,moxtet-gpio");

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de