From patchwork Tue Jan 28 11:59:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Jardim X-Patchwork-Id: 1230302 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BtSX/l0B; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 486QC761Q2z9sNF for ; Tue, 28 Jan 2020 22:59:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9372E81AD3; Tue, 28 Jan 2020 12:59:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BtSX/l0B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A68B817F2; Tue, 28 Jan 2020 12:59:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 79EDB817F2 for ; Tue, 28 Jan 2020 12:59:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jardim.c.pedro@gmail.com Received: by mail-qk1-x741.google.com with SMTP id x1so12982625qkl.12 for ; Tue, 28 Jan 2020 03:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=J2QbcCiHTN4vJS05NzgCZdaa6Dg4RAmdidGAzhZ2ZSI=; b=BtSX/l0BxKv8x/BWYaopBC2EA1esuw/XjueuAAsdOfdKC5/TbTXv1ScJvm97A1naU0 MqdgzOF/MpgSd1CPQ6IPLH1+JdC5suF7Dnw6OwT1TesjBzyybh3YHF/4S8iNMiRRCwgF 8495JXiDESpyvAdP4gi5w9v07d4KamX9Aq3y073YGZ/xDgX5swHGm4h5M0zfc2XJm5tA 8qietrs3uUyfXE9GgoSuDbj8gs9KVe12zfBko25vKrhwgLR5taFoWlCWb2XSmhtWwtTb 3WZEuK3KfYsRlPiQdAFiCG/PhfuuZSehyAjXkGL+oFWfXMDs6ddwJ/ySg+sGHE+nfge9 Arfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=J2QbcCiHTN4vJS05NzgCZdaa6Dg4RAmdidGAzhZ2ZSI=; b=V1P8bUuPaRm79VtLFGy0yT7Zs1Ea8LfMxzP2dz2X8p0b6Iyrhj2V7woXaCh26d5glO ytmvO3Gu/ivbg5JHYMFsjTKaudKXzcGFt7zdVAgiZ8zKJnx/ZK2guBp15dPh6dLnBT4Q 5IGoPaNVt0a1NkY0bTK/F8ySTd1A5TMvLzJelvkwZhVGXkfIcqdqrFuqdis0fDV37ETT GD6lwkroBCZp+eiVviO0HL1TpJ+mIiZ7xsAFnixA1R+sVFE/rYengVnZNvDN/9gFQakT Ey0n9JdlL9IIXyWxZhnHfeoU0tjgdVYw73Befr2ajodaodoMipb/3sGn1zApO6EG3b24 cLXA== X-Gm-Message-State: APjAAAVKr6ACWtMq2sHRFzZa9TpW6+OZSxG8fAsQ1jpQQzIHgB/twjJG jdYTowuoatemxacyAA2kXBo= X-Google-Smtp-Source: APXvYqx1uJW6n6Py6BfSgvqBaog8p33m1wno7kQVLTTwvml/yr+JKxVzf9aGXjLNHCqnxx/SGx8ZIQ== X-Received: by 2002:a05:620a:22ce:: with SMTP id o14mr21266513qki.424.1580212759835; Tue, 28 Jan 2020 03:59:19 -0800 (PST) Received: from e5450.nxp.com ([177.221.114.206]) by smtp.gmail.com with ESMTPSA id z4sm11873172qkz.62.2020.01.28.03.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 03:59:19 -0800 (PST) From: Pedro Jardim To: festevam@gmail.com, sbabic@denx.de Subject: [PATCH] mx6slevk: Convert to DM_ETH Date: Tue, 28 Jan 2020 08:59:59 -0300 Message-Id: <20200128115959.644-1-jardim.c.pedro@gmail.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, Pedro Jardim Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 --- board/freescale/mx6slevk/mx6slevk.c | 30 ----------------------------- configs/mx6slevk_defconfig | 2 ++ include/configs/mx6slevk.h | 5 +---- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 453f281418..f104f9930a 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include "../common/pfuze.h" @@ -102,34 +101,11 @@ static iomux_v3_cfg_t const usdhc3_pads[] = { }; #endif -static iomux_v3_cfg_t const fec_pads[] = { - MX6_PAD_FEC_MDC__FEC_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_MDIO__FEC_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_CRS_DV__FEC_RX_DV | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_RXD0__FEC_RX_DATA0 | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_RXD1__FEC_RX_DATA1 | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_TX_EN__FEC_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_TXD0__FEC_TX_DATA0 | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_TXD1__FEC_TX_DATA1 | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_REF_CLK__FEC_REF_OUT | MUX_PAD_CTRL(ENET_PAD_CTRL), - MX6_PAD_FEC_RX_ER__GPIO_4_19 | MUX_PAD_CTRL(NO_PAD_CTRL), - MX6_PAD_FEC_TX_CLK__GPIO_4_21 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - static void setup_iomux_uart(void) { imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } -static void setup_iomux_fec(void) -{ - imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); - - /* Power up LAN8720 PHY */ - gpio_request(ETH_PHY_POWER, "eth_pwr"); - gpio_direction_output(ETH_PHY_POWER , 1); - udelay(15000); -} int board_mmc_get_env_dev(int devno) { @@ -179,12 +155,6 @@ int power_init_board(void) #endif #ifdef CONFIG_FEC_MXC -int board_eth_init(bd_t *bis) -{ - setup_iomux_fec(); - - return cpu_eth_init(bis); -} static int setup_fec(void) { diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index a0f9df1f5f..2df1430a92 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -61,3 +61,5 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 6b2a174e7a..db5f9bcb60 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -32,10 +32,11 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CONFIG_ETHPRIME "eth0" #define CONFIG_PHY_SMSC -- 2.17.1