diff options
| author | Shaohui Xie <Shaohui.Xie@freescale.com> | 2015-12-04 10:22:03 +0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2015-12-17 08:52:19 +0800 |
| commit | ea1332ceb4698b199387b517e640705f93263161 (patch) | |
| tree | fdb3655583e6a50a48d63dde21e693cff43b88ec /drivers | |
| parent | 1c5c6a5761ace1f26862382438e4b3b850aa065d (diff) | |
| download | blackbird-obmc-uboot-ea1332ceb4698b199387b517e640705f93263161.tar.gz blackbird-obmc-uboot-ea1332ceb4698b199387b517e640705f93263161.zip | |
net: fm: disables unused FM1-DTSEC1 MAC node in DTS
We don't disable unused FM1-DTSEC1 MAC node in FMAN v2 since it is
used by MDIO. For FMAN v3, MDIO uses dedicated controller, so we
can disable unused FM1-DTSEC1 MAC node to avoid being probed in
Linux.
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
[York Sun: revised commit message]
Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fm/init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 3a1de59fd8..7e312f1517 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -242,8 +242,10 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) int off; uint32_t ph; phys_addr_t paddr = CONFIG_SYS_CCSRBAR_PHYS + info->compat_offset; +#ifndef CONFIG_SYS_FMAN_V3 u64 dtsec1_addr = (u64)CONFIG_SYS_CCSRBAR_PHYS + CONFIG_SYS_FSL_FM1_DTSEC1_OFFSET; +#endif off = fdt_node_offset_by_compat_reg(blob, prop, paddr); if (off == -FDT_ERR_NOTFOUND) @@ -295,8 +297,10 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) /* board code might have caused offset to change */ off = fdt_node_offset_by_compat_reg(blob, prop, paddr); +#ifndef CONFIG_SYS_FMAN_V3 /* Don't disable FM1-DTSEC1 MAC as its used for MDIO */ if (paddr != dtsec1_addr) +#endif fdt_status_disabled(blob, off); /* disable the MAC node */ /* disable the fsl,dpa-ethernet node that points to the MAC */ |
