Skip to contentSkip to conversation

mx6ul_evk: Move CONFIG_FEC_MXC to defconfig

PATCH New Fabio Estevam 3 participants 6 messages Feb 3, 2020 – Apr 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mx6ul_evk: Move CONFIG_FEC_MXC to defconfig

CONFIG_FEC_MXC is supported in Kconfig, so it is preferred to move it to defconfig file.

---
 configs/mx6ul_14x14_evk_defconfig | 1 +
 include/configs/mx6ul_14x14_evk.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
configs/mx6ul_14x14_evk_defconfig +1 -0
index 4fd311d2fb..f72f050561 100644
@@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
+CONFIG_FEC_MXC=y
 CONFIG_DM_ETH=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
include/configs/mx6ul_14x14_evk.h +0 -1
index 5cc15b6d2f..a35077ddb8 100644
@@ -177,7 +177,6 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC
 #define CONFIG_FEC_ENET_DEV		1
 
 #if (CONFIG_FEC_ENET_DEV == 0)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 mx6ul_evk: Remove FEC related board code

mx6ul_evk uses DM_ETH, so there is no need to have board code to setup the FEC IOMUX and to register the network ports via the old board_eth_init() method.

Remove these FEC related pieces of code.

---
 .../mx6ul_14x14_evk/mx6ul_14x14_evk.c         | 50 -------------------
 1 file changed, 50 deletions(-)
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -50
index 086e0e6739..6b87f5c1b0 100644
@@ -196,56 +196,6 @@ int board_ehci_hcd_init(int port)
 #endif
 
 #ifdef CONFIG_FEC_MXC
-/*
- * pin conflicts for fec1 and fec2, GPIO1_IO06 and GPIO1_IO07 can only
- * be used for ENET1 or ENET2, cannot be used for both.
- */
-static iomux_v3_cfg_t const fec1_pads[] = {
-	MX6_PAD_GPIO1_IO06__ENET1_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL),
-	MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_EN__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
-	MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const fec2_pads[] = {
-	MX6_PAD_GPIO1_IO06__ENET2_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL),
-	MX6_PAD_GPIO1_IO07__ENET2_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-
-	MX6_PAD_ENET2_TX_DATA0__ENET2_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET2_TX_DATA1__ENET2_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
-	MX6_PAD_ENET2_TX_EN__ENET2_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-
-	MX6_PAD_ENET2_RX_DATA0__ENET2_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET2_RX_DATA1__ENET2_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET2_RX_EN__ENET2_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET2_RX_ER__ENET2_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL),
-};
-
-static void setup_iomux_fec(int fec_id)
-{
-	if (fec_id == 0)
-		imx_iomux_v3_setup_multiple_pads(fec1_pads,
-						 ARRAY_SIZE(fec1_pads));
-	else
-		imx_iomux_v3_setup_multiple_pads(fec2_pads,
-						 ARRAY_SIZE(fec2_pads));
-}
-
-int board_eth_init(bd_t *bis)
-{
-	setup_iomux_fec(CONFIG_FEC_ENET_DEV);
-
-	return fecmxc_initialize_multi(bis, CONFIG_FEC_ENET_DEV,
-				       CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
 static int setup_fec(int fec_id)
 {
 	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 mx6ul_evk: Remove FEC related board code

Quoted 9 lines

Subject: [PATCH 2/2] mx6ul_evk: Remove FEC related board code

mx6ul_evk uses DM_ETH, so there is no need to have board code to setup the FEC IOMUX and to register the network ports via the old board_eth_init() method.

Remove these FEC related pieces of code.

Quoted 87 lines
---
 .../mx6ul_14x14_evk/mx6ul_14x14_evk.c         | 50 -------------------
 1 file changed, 50 deletions(-)
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -10
index 086e0e6739..6b87f5c1b0 100644
@@ -196,56 +196,6 @@ int board_ehci_hcd_init(int port)  #endif
 
 #ifdef CONFIG_FEC_MXC
-/*
- * pin conflicts for fec1 and fec2, GPIO1_IO06 and GPIO1_IO07 can only
- * be used for ENET1 or ENET2, cannot be used for both.
- */
-static iomux_v3_cfg_t const fec1_pads[] = {
-	MX6_PAD_GPIO1_IO06__ENET1_MDIO |
 MUX_PAD_CTRL(MDIO_PAD_CTRL),
-	MX6_PAD_GPIO1_IO07__ENET1_MDC |
 MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 |
 MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 |
 MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET1_TX_EN__ENET1_TX_EN |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 |

MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET1_RX_ER__ENET1_RX_ER |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET1_RX_EN__ENET1_RX_EN |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -4
-};
-
-static iomux_v3_cfg_t const fec2_pads[] = {
-	MX6_PAD_GPIO1_IO06__ENET2_MDIO |

MUX_PAD_CTRL(MDIO_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_GPIO1_IO07__ENET2_MDC |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -2
-
-	MX6_PAD_ENET2_TX_DATA0__ENET2_TDATA00 |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET2_TX_DATA1__ENET2_TDATA01 |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 |

MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET2_TX_EN__ENET2_TX_EN |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -2
-
-	MX6_PAD_ENET2_RX_DATA0__ENET2_RDATA00 |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET2_RX_DATA1__ENET2_RDATA01 |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET2_RX_EN__ENET2_RX_EN |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -1
-	MX6_PAD_ENET2_RX_ER__ENET2_RX_ER |

MUX_PAD_CTRL(ENET_PAD_CTRL),

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +0 -19
-};
-
-static void setup_iomux_fec(int fec_id) -{
-	if (fec_id == 0)
-		imx_iomux_v3_setup_multiple_pads(fec1_pads,
-						 ARRAY_SIZE(fec1_pads));
-	else
-		imx_iomux_v3_setup_multiple_pads(fec2_pads,
-						 ARRAY_SIZE(fec2_pads));
-}
-
-int board_eth_init(bd_t *bis)
-{
-	setup_iomux_fec(CONFIG_FEC_ENET_DEV);
-
-	return fecmxc_initialize_multi(bis, CONFIG_FEC_ENET_DEV,
-				       CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
 static int setup_fec(int fec_id)
 {
 	struct iomuxc *const iomuxc_regs = (struct iomuxc

*)IOMUXC_BASE_ADDR;
--
2.17.1

#3 lore raw

PATCH 2/2 mx6ul_evk: Remove FEC related board code

In reply to Fabio Estevam
Quoted 6 lines

mx6ul_evk uses DM_ETH, so there is no need to have board code to setup the FEC IOMUX and to register the network ports via the old board_eth_init() method.
Remove these FEC related pieces of code.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw

PATCH 1/2 mx6ul_evk: Move CONFIG_FEC_MXC to defconfig

In reply to Fabio Estevam
Quoted 6 lines

Subject: [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig

CONFIG_FEC_MXC is supported in Kconfig, so it is preferred to move it to defconfig file.

Quoted 31 lines
---
 configs/mx6ul_14x14_evk_defconfig | 1 +
include/configs/mx6ul_14x14_evk.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
configs/mx6ul_14x14_evk_defconfig +0 -0
index 4fd311d2fb..f72f050561 100644
@@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_STMICRO=y  CONFIG_PHYLIB=y

CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y

configs/mx6ul_14x14_evk_defconfig +1 -0
+CONFIG_FEC_MXC=y
 CONFIG_DM_ETH=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
include/configs/mx6ul_14x14_evk.h +0 -2
index 5cc15b6d2f..a35077ddb8 100644
@@ -177,7 +177,6 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC
 #define CONFIG_FEC_ENET_DEV		1
 
 #if (CONFIG_FEC_ENET_DEV == 0)
--

2.17.1

#5 lore raw

PATCH 1/2 mx6ul_evk: Move CONFIG_FEC_MXC to defconfig

In reply to Fabio Estevam
Quoted 4 lines

CONFIG_FEC_MXC is supported in Kconfig, so it is preferred to move it to defconfig file.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================