From patchwork Wed Feb 12 18:56:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Jardim X-Patchwork-Id: 1237023 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mBcWUzWl; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Hpk42PTKz9s3x for ; Thu, 13 Feb 2020 05:55:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 66B7B81254; Wed, 12 Feb 2020 19:55: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=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mBcWUzWl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7EE4981257; Wed, 12 Feb 2020 19:55:19 +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=-2.0 required=5.0 tests=BAYES_00,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-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (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 E3C818123A for ; Wed, 12 Feb 2020 19:55:16 +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-x743.google.com with SMTP id v2so3135355qkj.2 for ; Wed, 12 Feb 2020 10:55:16 -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=Chk3vdykrY39ve03zQLkK6pr30fOoPzVfcr6F1FZj8k=; b=mBcWUzWlJtmcQnBGMD1dVkNC4q1pvn4kgF6BYJwmZPuRTbBquCm5a94VM+fa+tTmxF /rhq4F+Vw0wvEvqUgObgmNlIiNXEfPBiBai2Ky87h7tlGDSAEpiPe/AnlLOdCFaS+ecg qBt1izWkGxEowM1TyedmPq2aQD4YjfAt2CyAf9oeovvYcLZrG11D7kzIDXGNc+6GZ6p8 KpIzgt0J54rNOWnEgmeH3j+P0GeUlljMbe4F5+6IKqMxGizAWQAevskJeTbuKLpOuLm+ g4B6sXURetCEiRSXzlJ6QOGv10cYF43YM9BCn9EJrtPTEC91mo2OdnAG1+R25DBOKUvn xlTw== 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=Chk3vdykrY39ve03zQLkK6pr30fOoPzVfcr6F1FZj8k=; b=af+w7tcfPvIpk+dtTcRGdAFcvMo/71ghPEPjj+mNfCA3Bqxpm4WUqTB0lnvvibxmaE 4Q3ELgbDtGOLfFTl5JpAQHRVk7mIfiwCRDFEdOXzVKJQyxENt4O9xgxgyjgG7SdMOzdz 4D46XWCDtqKVf55W3IuNfT7vmtI2hPKeNYYkcO/LhF9yrvI8OP+szgVgvYUUOseyzliX lcf3uiQhspdaoQ3tzeRVVJT1QUK9uKSUVcHp8M4AzLJPfPCAd0LU/4cyYGj3OjB5pQdr MU3wpblMROj0d2Y60r1tVvIjKj91lGdQyHko+iscJ4DhgTrbzbRrZqWPstriNK6HCt+B QrBA== X-Gm-Message-State: APjAAAXkO9G3SsWhsfOYAW6LCUD5n6fQLjAqD89yitpBUUiNwDpuIBf8 ZWccLn2863sNCpyfj3Nq45c= X-Google-Smtp-Source: APXvYqyRp+FjHiFJBLoPwVwrzobjsuKzUQdB/c4uubT8yGqfWPk6o/OGshGm406J/NOi368eYWOg6g== X-Received: by 2002:a37:9f52:: with SMTP id i79mr10939669qke.48.1581533715496; Wed, 12 Feb 2020 10:55:15 -0800 (PST) Received: from e5450.nxp.com ([177.221.114.206]) by smtp.gmail.com with ESMTPSA id 65sm665780qtf.95.2020.02.12.10.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 10:55:15 -0800 (PST) From: Pedro Jardim To: festevam@gmail.com, sbabic@denx.de, peng.fan@nxp.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Pedro Jardim Subject: [PATCH v2] mx6slevk: Convert to DM_ETH Date: Wed, 12 Feb 2020 15:56:00 -0300 Message-Id: <20200212185600.21689-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.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.1 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 Changes since v1" - Remove CONFIG_ETHPRIME Reviewed-by: Fabio Estevam --- board/freescale/mx6slevk/mx6slevk.c | 31 ----------------------------- configs/mx6slevk_defconfig | 3 +++ include/configs/mx6slevk.h | 6 ------ 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 453f281418..43029e4245 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,35 +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) { return devno; @@ -179,12 +154,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 dc22e830a3..163cb1a7ae 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -61,3 +61,6 @@ 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 +CONFIG_PHY_SMSC=y diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 6b2a174e7a..71d72d8c74 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -32,12 +32,7 @@ #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_PHY_SMSC #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ -- 2.17.1