public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] Freescale t104x: Do not exclude SGMII
@ 2014-10-24 14:49 Joakim Tjernlund
  2014-11-18 23:23 ` York Sun
  2014-12-05 16:17 ` York Sun
  0 siblings, 2 replies; 3+ messages in thread
From: Joakim Tjernlund @ 2014-10-24 14:49 UTC (permalink / raw)
  To: u-boot

fman_port_enet_if() tests if FM1_DTSEC2 or FM1_DTSEC4 uses
RGMII or MII and if not returns PHY_INTERFACE_MODE_NONE.
This excludes testing for SGMII further down.

Remove the unconditional "else return PHY_INTERFACE_MODE_NONE"
so SGMII can be tested too.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
---
 drivers/net/fm/t1040.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index 4cce46d..d2a097e 100644
--- a/drivers/net/fm/t1040.c
+++ b/drivers/net/fm/t1040.c
@@ -25,8 +25,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
 		else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
 				FSL_CORENET_RCWSR13_EC1_FM1_DTSEC4_MII)
 			return PHY_INTERFACE_MODE_MII;
-		else
-			return PHY_INTERFACE_MODE_NONE;
 	}
 
 	if ((port == FM1_DTSEC4) &&
@@ -38,8 +36,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
 		else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
 				FSL_CORENET_RCWSR13_EC1_FM1_DTSEC4_MII)
 			return PHY_INTERFACE_MODE_MII;
-		else
-			return PHY_INTERFACE_MODE_NONE;
 	}
 
 	if (port == FM1_DTSEC5) {
-- 
1.8.5.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] Freescale t104x: Do not exclude SGMII
  2014-10-24 14:49 [U-Boot] [PATCH] Freescale t104x: Do not exclude SGMII Joakim Tjernlund
@ 2014-11-18 23:23 ` York Sun
  2014-12-05 16:17 ` York Sun
  1 sibling, 0 replies; 3+ messages in thread
From: York Sun @ 2014-11-18 23:23 UTC (permalink / raw)
  To: u-boot

On 10/24/2014 07:49 AM, Joakim Tjernlund wrote:
> fman_port_enet_if() tests if FM1_DTSEC2 or FM1_DTSEC4 uses
> RGMII or MII and if not returns PHY_INTERFACE_MODE_NONE.
> This excludes testing for SGMII further down.
> 
> Remove the unconditional "else return PHY_INTERFACE_MODE_NONE"
> so SGMII can be tested too.
> 
> Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> ---
>  drivers/net/fm/t1040.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
> index 4cce46d..d2a097e 100644
> --- a/drivers/net/fm/t1040.c
> +++ b/drivers/net/fm/t1040.c
> @@ -25,8 +25,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
>  		else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
>  				FSL_CORENET_RCWSR13_EC1_FM1_DTSEC4_MII)
>  			return PHY_INTERFACE_MODE_MII;
> -		else
> -			return PHY_INTERFACE_MODE_NONE;
>  	}
>  
>  	if ((port == FM1_DTSEC4) &&
> @@ -38,8 +36,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
>  		else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
>  				FSL_CORENET_RCWSR13_EC1_FM1_DTSEC4_MII)
>  			return PHY_INTERFACE_MODE_MII;
> -		else
> -			return PHY_INTERFACE_MODE_NONE;
>  	}
>  
>  	if (port == FM1_DTSEC5) {
> 

Prabhakar,

Can you test/ack this patch?

York

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] Freescale t104x: Do not exclude SGMII
  2014-10-24 14:49 [U-Boot] [PATCH] Freescale t104x: Do not exclude SGMII Joakim Tjernlund
  2014-11-18 23:23 ` York Sun
@ 2014-12-05 16:17 ` York Sun
  1 sibling, 0 replies; 3+ messages in thread
From: York Sun @ 2014-12-05 16:17 UTC (permalink / raw)
  To: u-boot

On 10/24/2014 07:49 AM, Joakim Tjernlund wrote:
> fman_port_enet_if() tests if FM1_DTSEC2 or FM1_DTSEC4 uses
> RGMII or MII and if not returns PHY_INTERFACE_MODE_NONE.
> This excludes testing for SGMII further down.
> 
> Remove the unconditional "else return PHY_INTERFACE_MODE_NONE"
> so SGMII can be tested too.
> 
> Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> ---

Applied to u-boot-mpc85xx, awaiting upstream.

York

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-12-05 16:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-24 14:49 [U-Boot] [PATCH] Freescale t104x: Do not exclude SGMII Joakim Tjernlund
2014-11-18 23:23 ` York Sun
2014-12-05 16:17 ` York Sun

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox