diff mbox series

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

Message ID 20200203160923.23548-2-festevam@gmail.com
State Accepted
Commit b0b525a942040de7cc7c59ca310a078596ff4c8b
Headers show
Series [1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig | expand

Commit Message

Fabio Estevam Feb. 3, 2020, 4:09 p.m. UTC
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.

Signed-off-by: Fabio Estevam <festevam at gmail.com>
---
 .../mx6ul_14x14_evk/mx6ul_14x14_evk.c         | 50 -------------------
 1 file changed, 50 deletions(-)

Comments

Peng Fan Feb. 5, 2020, 7:21 a.m. UTC | #1
> 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.
> 
> Signed-off-by: Fabio Estevam <festevam at gmail.com>

Reviewed-by: Peng Fan <peng.fan at nxp.com>

> ---
>  .../mx6ul_14x14_evk/mx6ul_14x14_evk.c         | 50 -------------------
>  1 file changed, 50 deletions(-)
> 
> diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> index 086e0e6739..6b87f5c1b0 100644
> --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> @@ -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;
> --
> 2.17.1
Stefano Babic April 18, 2020, 10:50 a.m. UTC | #2
> 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.
> Signed-off-by: Fabio Estevam <festevam at gmail.com>
> Reviewed-by: Peng Fan <peng.fan at nxp.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 086e0e6739..6b87f5c1b0 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -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;