diff mbox

[U-Boot] net: fm: disables unused FM1-DTSEC1 MAC node in DTS

Message ID 1449195723-24472-1-git-send-email-shh.xie@gmail.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

shaohui xie Dec. 4, 2015, 2:22 a.m. UTC 
From: Shaohui Xie <Shaohui.Xie@freescale.com>

We don't disable unused FM1-DTSEC1 MAC node in FMAN v2 since its used
for MDIO, in FMAN v3, MDIO uses dedicated controller, so we can disable
the unused FM1-DTSEC1 MAC node to avoid it's being probed in kernel.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
---
 drivers/net/fm/init.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

York Sun Dec. 16, 2015, 9:04 a.m. UTC | #1 
On 12/04/2015 10:22 AM, shh.xie@gmail.com wrote:
> From: Shaohui Xie <Shaohui.Xie@freescale.com>
> 
> We don't disable unused FM1-DTSEC1 MAC node in FMAN v2 since its used
> for MDIO, in FMAN v3, MDIO uses dedicated controller, so we can disable
> the unused FM1-DTSEC1 MAC node to avoid it's being probed in kernel.
> 
> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
> ---

Revised commit message.
Applied to u-boot-fsl-qoriq master. Awaiting upstream.

York
diff mbox

Patch

diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 3a1de59..7e312f1 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 */