Commit ae8a5d10 authored by Shengzhou Liu's avatar Shengzhou Liu Committed by Andy Fleming
Browse files

net/fm: fixup ethernet for mEMAC



- set proper compatible property name for mEMAC.
- fixed ft_fixup_port for dual-role mEMAC, which will lead to
  MAC node disabled incorrectly.

Signed-off-by: default avatarShengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: default avatarAndy Fleming <afleming@freescale.com>
parent 95927808
...@@ -152,4 +152,6 @@ struct fm_eth { ...@@ -152,4 +152,6 @@ struct fm_eth {
#define MAX_RXBUF_LOG2 11 #define MAX_RXBUF_LOG2 11
#define MAX_RXBUF_LEN (1 << MAX_RXBUF_LOG2) #define MAX_RXBUF_LEN (1 << MAX_RXBUF_LOG2)
#define PORT_IS_ENABLED(port) fm_info[fm_port_to_index(port)].enabled
#endif /* __FM_H__ */ #endif /* __FM_H__ */
...@@ -238,6 +238,26 @@ static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) ...@@ -238,6 +238,26 @@ static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
return ; return ;
} }
#ifdef CONFIG_SYS_FMAN_V3
/*
* Physically FM1_DTSEC9 and FM1_10GEC1 use the same dual-role MAC, when
* FM1_10GEC1 is enabled and FM1_DTSEC9 is disabled, ensure that the
* dual-role MAC is not disabled, ditto for other dual-role MACs.
*/
if (((info->port == FM1_DTSEC9) && (PORT_IS_ENABLED(FM1_10GEC1))) ||
((info->port == FM1_DTSEC10) && (PORT_IS_ENABLED(FM1_10GEC2))) ||
((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC9))) ||
((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC10)))
#if (CONFIG_SYS_NUM_FMAN == 2)
||
((info->port == FM2_DTSEC9) && (PORT_IS_ENABLED(FM2_10GEC1))) ||
((info->port == FM2_DTSEC10) && (PORT_IS_ENABLED(FM2_10GEC2))) ||
((info->port == FM2_10GEC1) && (PORT_IS_ENABLED(FM2_DTSEC9))) ||
((info->port == FM2_10GEC2) && (PORT_IS_ENABLED(FM2_DTSEC10)))
#endif
)
return;
#endif
/* board code might have caused offset to change */ /* board code might have caused offset to change */
off = fdt_node_offset_by_compat_reg(blob, prop, paddr); off = fdt_node_offset_by_compat_reg(blob, prop, paddr);
...@@ -255,10 +275,15 @@ void fdt_fixup_fman_ethernet(void *blob) ...@@ -255,10 +275,15 @@ void fdt_fixup_fman_ethernet(void *blob)
{ {
int i; int i;
#ifdef CONFIG_SYS_FMAN_V3
for (i = 0; i < ARRAY_SIZE(fm_info); i++)
ft_fixup_port(blob, &fm_info[i], "fsl,fman-memac");
#else
for (i = 0; i < ARRAY_SIZE(fm_info); i++) { for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
if (fm_info[i].type == FM_ETH_1G_E) if (fm_info[i].type == FM_ETH_1G_E)
ft_fixup_port(blob, &fm_info[i], "fsl,fman-1g-mac"); ft_fixup_port(blob, &fm_info[i], "fsl,fman-1g-mac");
else else
ft_fixup_port(blob, &fm_info[i], "fsl,fman-10g-mac"); ft_fixup_port(blob, &fm_info[i], "fsl,fman-10g-mac");
} }
#endif
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment