From patchwork Fri Apr 2 16:52:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461825 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=sSGp1fIi; 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 4FBmN61GYZz9sVb for ; Sat, 3 Apr 2021 03:53:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F02C81668; Fri, 2 Apr 2021 18:53:08 +0200 (CEST) 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="sSGp1fIi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31778814E1; Fri, 2 Apr 2021 18:53:03 +0200 (CEST) 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-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (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 5889480C80 for ; Fri, 2 Apr 2021 18:52:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x42b.google.com with SMTP id v4so5198690wrp.13 for ; Fri, 02 Apr 2021 09:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cKYMDJw4bXcX7RAf0u+4L52+Z3NlP88GXGWVnK2YGGw=; b=sSGp1fIib8bIVeUEY8IcqJhzbWL7fHpjlBaLIMRSukQx7+30byatjftGERyyZ6YW/L +EcOCzmJuRhZgCwBuGU8B6pBZYK8+WBn+280xbJkpkcyyh2LjluiNe6sDK3Ro95N16J8 hDiQKhCNgvwVHVj/SNnUHamq0Kzos/gqa295Yr1EW7WF62MhaZ/GJhauGeoUHHPntZhi bMLoEC6RIS5JdOnPgKvsev86OxEUlpL36eXk+LHSwPhsflfuv649AXnp3chwslr7+qe3 E/gYB9j3L3pkd9AsjVdHSmDUaGWqknsn8ipWXh6bdAea0lIQO0pwz56nd4A5hVtmOxek Qurg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=cKYMDJw4bXcX7RAf0u+4L52+Z3NlP88GXGWVnK2YGGw=; b=kQ/HP09ypQJHrQTFhpjMidY+tPM3vRiSj2/VWQs8+pWxCH0huINnM1MDzq174wQlDa eZvcyhFUQeBVbRsf3W/QYWrSqZ9yWQlSOS61TfAGgqJ6YiEQ3ZpOaiqc8EcbJs5LnLYB mGAXy78gellXEmicmMscdilEpbVa0sJE4fy8gFYXjaSbeKZrtuuV4yrI1pHMSJuD8mjV XOeL+sCVFLnDzMclfEU2xBlQfscysbYPN1xLtXs2HTg4OUprsosXb0OeHfA1bxND/5e9 lz4P2p35UbpBHaopxGltHlFkb3I9TUCL10R3LhAx/K2mfxIOKlKgYIWyTmh3pqC6FmDQ c65g== X-Gm-Message-State: AOAM530X7u4xTBSvREMuuuSWvjBxQmuF/csi2MxR0spxYf+Rg23btJgT 2u732/1BfCNltvDm3YfbHjZFyjtE5UI= X-Google-Smtp-Source: ABdhPJyPfsz4sU+feZ1mKC3pJOkLBM9KsbkZwmcA1AxVJFugv1IGX7Lqyw8n2ZSuo9VaiS+VkrPUyQ== X-Received: by 2002:a05:6000:221:: with SMTP id l1mr16125563wrz.370.1617382377969; Fri, 02 Apr 2021 09:52:57 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id s12sm12115030wmj.28.2021.04.02.09.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 09:52:57 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Fabio Estevam , Stefano Babic Subject: [PATCH 5/5] ARM: imx: udoo: convert to DM_ETH Date: Fri, 2 Apr 2021 17:52:51 +0100 Message-Id: <20210402165251.1018596-5-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402165251.1018596-1-pbrobinson@gmail.com> References: <20210402165251.1018596-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.4 at phobos.denx.de X-Virus-Status: Clean Convert the UDOO board to use DM_ETH. Signed-off-by: Peter Robinson Cc: Fabio Estevam Cc: Stefano Babic --- board/udoo/udoo.c | 75 ++---------------------------------------- configs/udoo_defconfig | 2 ++ include/configs/udoo.h | 8 ----- 3 files changed, 4 insertions(+), 81 deletions(-) diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c index c1acc25a9d..5c49388cbf 100644 --- a/board/udoo/udoo.c +++ b/board/udoo/udoo.c @@ -88,45 +88,8 @@ int mx6_rgmii_rework(struct phy_device *phydev) return 0; } -static iomux_v3_cfg_t const enet_pads1[] = { - IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_ENET_MDC__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)), - /* RGMII reset */ - IOMUX_PADS(PAD_EIM_D23__GPIO3_IO23 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* Ethernet power supply */ - IOMUX_PADS(PAD_EIM_EB3__GPIO2_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* pin 32 - 1 - (MODE0) all */ - IOMUX_PADS(PAD_RGMII_RD0__GPIO6_IO25 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* pin 31 - 1 - (MODE1) all */ - IOMUX_PADS(PAD_RGMII_RD1__GPIO6_IO27 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* pin 28 - 1 - (MODE2) all */ - IOMUX_PADS(PAD_RGMII_RD2__GPIO6_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* pin 27 - 1 - (MODE3) all */ - IOMUX_PADS(PAD_RGMII_RD3__GPIO6_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* pin 33 - 1 - (CLK125_EN) 125Mhz clockout enabled */ - IOMUX_PADS(PAD_RGMII_RX_CTL__GPIO6_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; - -static iomux_v3_cfg_t const enet_pads2[] = { - 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)), -}; - static void setup_iomux_enet(void) { - SETUP_IOMUX_PADS(enet_pads1); - udelay(20); gpio_direction_output(IMX_GPIO_NR(2, 31), 1); /* Power supply on */ gpio_direction_output(IMX_GPIO_NR(3, 23), 0); /* assert PHY rst */ @@ -148,8 +111,6 @@ static void setup_iomux_enet(void) gpio_free(IMX_GPIO_NR(6, 27)); gpio_free(IMX_GPIO_NR(6, 28)); gpio_free(IMX_GPIO_NR(6, 29)); - - SETUP_IOMUX_PADS(enet_pads2); } static void setup_iomux_uart(void) @@ -165,40 +126,6 @@ static void setup_iomux_wdog(void) gpio_direction_input(WDT_TRG); } -int board_eth_init(struct bd_info *bis) -{ - uint32_t base = IMX_FEC_BASE; - struct mii_dev *bus = NULL; - struct phy_device *phydev = NULL; - int ret; - - setup_iomux_enet(); - -#ifdef CONFIG_FEC_MXC - bus = fec_get_miibus(base, -1); - if (!bus) - return -EINVAL; - /* scan phy 4,5,6,7 */ - phydev = phy_find_by_mask(bus, (0xf << 4), PHY_INTERFACE_MODE_RGMII); - - if (!phydev) { - ret = -EINVAL; - goto free_bus; - } - printf("using phy at %d\n", phydev->addr); - ret = fec_probe(bis, -1, base, bus, phydev); - if (ret) - goto free_phydev; -#endif - return 0; - -free_phydev: - free(phydev); -free_bus: - free(bus); - return ret; -} - int board_early_init_f(void) { setup_iomux_wdog(); @@ -232,6 +159,8 @@ int board_late_init(void) else env_set("board_rev", "MX6DL"); #endif + setup_iomux_enet(); + return 0; } diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig index 2735f02af3..064d545e34 100644 --- a/configs/udoo_defconfig +++ b/configs/udoo_defconfig @@ -48,6 +48,8 @@ CONFIG_PINCTRL_IMX6=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_DM_THERMAL=y diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 25f40074c5..298369373a 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -23,14 +23,6 @@ /* SATA Configs */ #define CONFIG_LBA48 -/* Network support */ - -#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 6 - /* MMC Configuration */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0