[PATCH V2 2/2] pico-imx7d: Convert to DM_ETH
Stefano Babic
sbabic at denx.de
Mon Jan 6 13:14:05 CET 2020
On 06/01/20 00:22, Joris Offouga wrote:
> Signed-off-by: Joris Offouga <offougajoris at gmail.com>
> ---
> Change v1 -> v2
> Disable usb ethernet support with patch : pico-imx7d: Disable USB_ETHER support for bl33
>
> board/technexion/pico-imx7d/pico-imx7d.c | 46 ------------------------
> configs/pico-dwarf-imx7d_defconfig | 5 +++
> configs/pico-hobbit-imx7d_defconfig | 5 +++
> configs/pico-imx7d_bl33_defconfig | 5 +++
> configs/pico-imx7d_defconfig | 5 +++
> configs/pico-nymph-imx7d_defconfig | 5 +++
> configs/pico-pi-imx7d_defconfig | 5 +++
> include/configs/pico-imx7d.h | 11 ------
> 8 files changed, 30 insertions(+), 57 deletions(-)
>
> diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
> index bcfc7d361e..b7ca2e1315 100644
> --- a/board/technexion/pico-imx7d/pico-imx7d.c
> +++ b/board/technexion/pico-imx7d/pico-imx7d.c
> @@ -16,7 +16,6 @@
> #include <common.h>
> #include <i2c.h>
> #include <miiphy.h>
> -#include <netdev.h>
> #include <power/pmic.h>
> #include <power/pfuze3000_pmic.h>
> #include "../../freescale/common/pfuze.h"
> @@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
> #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
> PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
>
> -#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
> -#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM)
> -
> -#define ENET_RX_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
> -
> #define I2C_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
> PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
>
> @@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
> };
>
> #ifdef CONFIG_FEC_MXC
> -static iomux_v3_cfg_t const fec1_pads[] = {
> - MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
> - MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
> - MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> - MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> - MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
> - MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
> -};
> -
> -#define FEC1_RST_GPIO IMX_GPIO_NR(6, 11)
> -
> -static void setup_iomux_fec(void)
> -{
> - imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
> - gpio_request(FEC1_RST_GPIO, "phy_rst");
> - gpio_direction_output(FEC1_RST_GPIO, 0);
> - udelay(500);
> - gpio_set_value(FEC1_RST_GPIO, 1);
> -}
> -
> -int board_eth_init(bd_t *bis)
> -{
> - setup_iomux_fec();
> -
> - return fecmxc_initialize_multi(bis, 0,
> - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
> -}
> -
> static int setup_fec(void)
> {
> struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
> @@ -235,9 +191,7 @@ int board_init(void)
> gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
>
> #ifdef CONFIG_DM_VIDEO
> -
> setup_lcd();
> -
> #endif
> #ifdef CONFIG_FEC_MXC
> setup_fec();
> diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
> index 5416b4581b..f328b41b8f 100644
> --- a/configs/pico-dwarf-imx7d_defconfig
> +++ b/configs/pico-dwarf-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
> index 57b64c632f..ea127069e9 100644
> --- a/configs/pico-hobbit-imx7d_defconfig
> +++ b/configs/pico-hobbit-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
> index a32b4d680f..db9daf9d69 100644
> --- a/configs/pico-imx7d_bl33_defconfig
> +++ b/configs/pico-imx7d_bl33_defconfig
> @@ -50,6 +50,11 @@ CONFIG_DM_MMC=y
> CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
> index aa9c935bdd..928adfa349 100644
> --- a/configs/pico-imx7d_defconfig
> +++ b/configs/pico-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig
> index 5416b4581b..f328b41b8f 100644
> --- a/configs/pico-nymph-imx7d_defconfig
> +++ b/configs/pico-nymph-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
> index 61e83520d5..872834b3a8 100644
> --- a/configs/pico-pi-imx7d_defconfig
> +++ b/configs/pico-pi-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
> index 1d0df9dd44..4dc206566e 100644
> --- a/include/configs/pico-imx7d.h
> +++ b/include/configs/pico-imx7d.h
> @@ -29,17 +29,6 @@
>
> #define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR
>
> -/* Network */
> -#define CONFIG_FEC_MXC
> -#define CONFIG_FEC_XCV_TYPE RGMII
> -#define CONFIG_ETHPRIME "FEC"
> -#define CONFIG_FEC_MXC_PHYADDR 1
> -
> -#define CONFIG_PHY_ATHEROS
> -
> -/* ENET1 */
> -#define IMX_FEC_BASE ENET_IPS_BASE_ADDR
> -
> /* MMC Config */
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
>
>
Reviewed-by: Stefano Babic <sbabic at denx.de>
Bext regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
More information about the U-Boot
mailing list