From patchwork Thu Feb 13 17:59:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Jardim X-Patchwork-Id: 1237640 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=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=IjNgSav6; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48JPQd2G8Bz9sP7 for ; Fri, 14 Feb 2020 04:59:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9BE98123E; Thu, 13 Feb 2020 18:58:59 +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="IjNgSav6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A0BF81244; Thu, 13 Feb 2020 18:58:58 +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-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (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 6AFB28120A for ; Thu, 13 Feb 2020 18:58:55 +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-qt1-x843.google.com with SMTP id t13so5063338qto.3 for ; Thu, 13 Feb 2020 09:58:55 -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=YzZjGjMC9qxqm79ifiWOKFiLnST+MN/MWEAyOn9Lb5A=; b=IjNgSav6atzni+TJaYnlRTFYud9aOIH+omxAbzBj7/uJunal8Uxh4JqTgBq73J+8Fw cJPwzEP5gYOjtYWc76adiUF/KF8FehatspDfaisRHZMsGjaMtmlGYnRI4YP6/y+JlSxn 0D6qV37UV6pDS6YMbTcsOw6/1LEGdLAr+E6My2t0wUYA7Py6d4evEd0azzRXT01Rm/jK UDJT7tMe0UU9gDlJk4GUaPbyCdp+7VcqPt0dcLZ2l9lYDBX+Iy+NKy/43rtRo9qW2L7W oQucaoIb3VO0OFaYuc1s1DwkNdoJFGRBqWq14pdjo+V53Lkaa9bC6fEj87Q7wgqU13DC PtEQ== 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=YzZjGjMC9qxqm79ifiWOKFiLnST+MN/MWEAyOn9Lb5A=; b=GSkfYSO0wWM9enXAbxU6PsN5H5AULVQSrKcI1FHb47w81tN3PyGfLUq7Qw/hYiE3t0 Uy6gOAImx3mh/R+DO5+1WfK8mBBYQ9yegcLkigK6EPQJLAMLcv+05SEi0GpOQ9eIn+ik NWBOdIC9fOdoYwzzosYTq/Aw6RFLHkJjd8xl3hSvaUNS7BiDD73wEemIHSL430VjsM6s dIYcHWvDKUC6Af9o6GryDkQFNeGykNyGjbclnTXiwVbGkU4ExDpvrRvdh0KkTpZh8ABJ Z2h4fRJIsGv6qOxbIsueyb6XfHLW+Sls8VCK/G3ag2DKP8621w3H7C/qO421Be0USCzy 2uzg== X-Gm-Message-State: APjAAAW5ZbvVHyqR6rsv8fnS7RYSi6SsX/e1mqELQSTwNyW3dlju3YmG jKc55T3OpO8CGz5Sgb0pnKM= X-Google-Smtp-Source: APXvYqwRtytqq4U75SwPUzMxpxA/1am3b8E6PsdQvdSHrK2T8K82PKQxP6fXWLR3v73oX8TInU8cnA== X-Received: by 2002:aed:2284:: with SMTP id p4mr12452171qtc.329.1581616734125; Thu, 13 Feb 2020 09:58:54 -0800 (PST) Received: from e5450.nxp.com ([177.221.114.206]) by smtp.gmail.com with ESMTPSA id t123sm1662794qke.8.2020.02.13.09.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 09:58:53 -0800 (PST) From: Pedro Jardim To: sbabic@denx.de, festevam@gmail.com, peng.fan@nxp.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Pedro Jardim Subject: [PATCH v2] mx6sabreauto: Convert to DM_ETH Date: Thu, 13 Feb 2020 14:59:43 -0300 Message-Id: <20200213175943.11615-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 Reviewed-by: Fabio Estevam --- Changes since v1: - Remove CONFIG_ETHPRIME=y - Remove CONFIG_FEC_MXC_PHYADDR=y board/freescale/mx6sabreauto/mx6sabreauto.c | 42 ------------- configs/mx6sabreauto_defconfig | 6 +++ include/configs/mx6sabreauto.h | 7 --- 3 files changed, 6 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 #include #include -#include #include #include #include @@ -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 */