[PATCH 4/4] mx6sabreauto: Convert to DM_ETH

[Stefano Babic]

On 20.01.20 17:31, Alifer Moraes wrote:
> From: Pedro Jardim <jardim.c.pedro at gmail.com>
> 
> This fixes the following warning:
> 
> ===================== WARNING ======================
> This board does not use CONFIG_DM_ETH (Driver Model
> for Ethernet drivers). Please update the board to use
> CONFIG_DM_ETH before the v2020.07 release. Failure to
> update by the deadline may result in board removal.
> See doc/driver-model/migration.rst for more info.
> ====================================================
> 
> Signed-off-by: Pedro Jardim <jardim.c.pedro at gmail.com>
> Signed-off-by: Alifer Moraes <alifer.wsdm at gmail.com>
> ---

This causes warnings, too. Please fix them, thanks !

Best regards,
Stefano

>  board/freescale/mx6sabreauto/mx6sabreauto.c | 42 -------------
>  configs/mx6sabreauto_defconfig              |  8 +++
>  include/configs/mx6sabreauto.h              |  7 ---
>  3 files changed, 8 insertions(+), 49 deletions(-)
> 
> diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
> index 140f24459d..de19a562eb 100644
> --- a/board/freescale/mx6sabreauto/mx6sabreauto.c
> +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
> @@ -22,7 +22,6 @@
>  #include <mmc.h>
>  #include <fsl_esdhc_imx.h>
>  #include <miiphy.h>
> -#include <netdev.h>
>  #include <asm/arch/sys_proto.h>
>  #include <i2c.h>
>  #include <input.h>
> @@ -76,23 +75,6 @@ static iomux_v3_cfg_t const uart4_pads[] = {
>  	IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
>  };
>  
> -static iomux_v3_cfg_t const enet_pads[] = {
> -	IOMUX_PADS(PAD_KEY_COL1__ENET_MDIO		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_KEY_COL2__ENET_MDC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -};
>  
>  /* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */
>  static struct i2c_pads_info mx6q_i2c_pad_info1 = {
> @@ -259,10 +241,6 @@ static void setup_iomux_eimnor(void)
>  }
>  #endif
>  
> -static void setup_iomux_enet(void)
> -{
> -	SETUP_IOMUX_PADS(enet_pads);
> -}
>  
>  static iomux_v3_cfg_t const usdhc3_pads[] = {
>  	IOMUX_PADS(PAD_SD3_CLK__SD3_CLK		| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> @@ -340,26 +318,6 @@ static void setup_gpmi_nand(void)
>  }
>  #endif
>  
> -static void setup_fec(void)
> -{
> -	if (is_mx6dqp()) {
> -		/*
> -		 * select ENET MAC0 TX clock from PLL
> -		 */
> -		imx_iomux_set_gpr_register(5, 9, 1, 1);
> -		enable_fec_anatop_clock(0, ENET_125MHZ);
> -	}
> -
> -	setup_iomux_enet();
> -}
> -
> -int board_eth_init(bd_t *bis)
> -{
> -	setup_fec();
> -
> -	return cpu_eth_init(bis);
> -}
> -
>  u32 get_board_rev(void)
>  {
>  	int rev = nxp_board_rev();
> diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
> index c53d079f88..69dfc1a3a1 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -96,3 +96,11 @@ CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_BPP16=y
>  CONFIG_SYS_WHITE_ON_BLACK=y
>  CONFIG_VIDEO_IPUV3=y
> +CONFIG_FEC_MXC=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_RGMII=y
> diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
> index c07b03984a..68465b8e08 100644
> --- a/include/configs/mx6sabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -75,12 +75,5 @@
>  #define CONFIG_POWER_PFUZE100
>  #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
>  
> -#define CONFIG_FEC_MXC
> -#define IMX_FEC_BASE			ENET_BASE_ADDR
> -#define CONFIG_FEC_XCV_TYPE		RGMII
> -#define CONFIG_ETHPRIME			"FEC"
> -#define CONFIG_FEC_MXC_PHYADDR		1
> -
> -#define CONFIG_PHY_ATHEROS
>  
>  #endif                         /* __MX6SABREAUTO_CONFIG_H */
> 


-- 
=====================================================================
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
=====================================================================