Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10914C433EF for ; Wed, 23 Feb 2022 13:51:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E3D3283C22; Wed, 23 Feb 2022 14:51:05 +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="JK5IuRHo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 78F6C83C36; Wed, 23 Feb 2022 14:51:03 +0100 (CET) Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 9B62083BA2 for ; Wed, 23 Feb 2022 14:50: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=aford173@gmail.com Received: by mail-il1-x12e.google.com with SMTP id w4so4214061ilj.5 for ; Wed, 23 Feb 2022 05:50:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gde+UFZJuVypxjNNY1UyvyAv4iK1bP/k2nz/HUIJ0+g=; b=JK5IuRHouMj1uNDQVZXXwzIT+nKJ8TvNLjYYPfgP05SKUe86fM+4bMlrmabH7qL/k+ iw6uuSy0+Q3jSJMSJm3cec4TihE0+svxLAtePQjLtgO5AacmbPGFnh4GukMvfT1YqtAk 9ckJfAjB9/7gYXLLBW2RhehhJztn4Vq1CqkHr1V8SIqQ6kmoSVN/37xBS02qkZvnbyYw BqXutQmqbMqEgop8H+7VaK+JEmHUkFetJ0aYNr2uVa2sRJMQxVd/+Yz1hBQ2xZMHiBvN Byga/mcWBVCkeSdNBGpW7llOPTjfIZA8ekGe3WW037gtFXVqw1bSLQpNkZo6xL5Jgj5/ 58pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gde+UFZJuVypxjNNY1UyvyAv4iK1bP/k2nz/HUIJ0+g=; b=y8qaMVjQMyIp4pkenRhvykrF3mZZsqi8eZf4pmUsdYWhtNv/H0r1b+IJqyEbOWfRQH Crzn1NafHdNXqLedSqZRflbpI9lxauCr+LwUxH3wPtgcsYnMEjSvz+Y8Ff1TVCHyLKcE C9TXvGmm2z1uxEsRbU2TPKiZy7kgBl2VoFPtNJdOkYAwqYeXMrU/+OJRpHILMS/AT2Lz snRabMP3VpVtvZdUVamkOBvBPBxB3dzMoOmEGGxu7lF8/lOeDd2iJzyGvU8kwb9Dvt1N +WTr1PdZ9YuWTZm167sAYWC9+EUVFEpOM9oI7jer+gfwIm0/Zgi1qtkli3bqTFiFL/7d 9KJw== X-Gm-Message-State: AOAM532uEFIhYdzWgglDEaFrlgR/wP0D1QG+bvbBgD0nclX4nyPLKrC0 6WCTxk9q36h8NvBDVXlaJtGqvDxnG53Q8g== X-Google-Smtp-Source: ABdhPJzL3N8Qj8mvXVZf7vl2A/XKWpNKQfSsX1FvNc8egQ1YtyaZW/DzS+5jZDgw+YScx6mpjhKzCQ== X-Received: by 2002:a92:c564:0:b0:2c2:2009:abe4 with SMTP id b4-20020a92c564000000b002c22009abe4mr15719864ilj.319.1645624257747; Wed, 23 Feb 2022 05:50:57 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:8681:254b:4463:df83]) by smtp.gmail.com with ESMTPSA id p9sm6389234ios.45.2022.02.23.05.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 05:50:57 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: sbabic@denx.de, Adam Ford Subject: [PATCH] imx: imx8mm/imx8mn_beacon: Remove redundant code Date: Wed, 23 Feb 2022 07:50:51 -0600 Message-Id: <20220223135051.27707-1-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean The Ethernet controller and PHY use the device tree info to configure themselves, so it's not necessary to manually do it in the board file. This permits the removal of a bunch of headers as well. Signed-off-by: Adam Ford diff --git a/board/beacon/imx8mm/imx8mm_beacon.c b/board/beacon/imx8mm/imx8mm_beacon.c index c228bbf777..204235a3f8 100644 --- a/board/beacon/imx8mm/imx8mm_beacon.c +++ b/board/beacon/imx8mm/imx8mm_beacon.c @@ -1,52 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2020 Compass Electronics Group, LLC + * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include -#include -#include #include -#include -#include -#include - DECLARE_GLOBAL_DATA_PTR; -#if IS_ENABLED(CONFIG_FEC_MXC) -static int setup_fec(void) -{ - struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR; - - /* Use 125M anatop REF_CLK1 for ENET1, not from external */ - clrsetbits_le32(&gpr->gpr[1], 0x2000, 0); - - return 0; -} - -int board_phy_config(struct phy_device *phydev) -{ - /* enable rgmii rxc skew and phy mode select to RGMII copper */ - phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x1f); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x8); - - phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x00); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x82ee); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x05); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x100); - - if (phydev->drv->config) - phydev->drv->config(phydev); - return 0; -} -#endif - int board_init(void) { - if (IS_ENABLED(CONFIG_FEC_MXC)) - setup_fec(); - return 0; } diff --git a/board/beacon/imx8mn/imx8mn_beacon.c b/board/beacon/imx8mn/imx8mn_beacon.c index 6397dac872..204235a3f8 100644 --- a/board/beacon/imx8mn/imx8mn_beacon.c +++ b/board/beacon/imx8mn/imx8mn_beacon.c @@ -1,52 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2020 Compass Electronics Group, LLC + * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include -#include -#include - -#include -#include #include -#include DECLARE_GLOBAL_DATA_PTR; -#if IS_ENABLED(CONFIG_FEC_MXC) -static int setup_fec(void) -{ - struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR; - - /* Use 125M anatop REF_CLK1 for ENET1, not from external */ - clrsetbits_le32(&gpr->gpr[1], 0x2000, 0); - - return 0; -} - -int board_phy_config(struct phy_device *phydev) -{ - /* enable rgmii rxc skew and phy mode select to RGMII copper */ - phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x1f); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x8); - - phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x00); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x82ee); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x05); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x100); - - if (phydev->drv->config) - phydev->drv->config(phydev); - return 0; -} -#endif - int board_init(void) { - if (IS_ENABLED(CONFIG_FEC_MXC)) - setup_fec(); - return 0; } -- 2.34.1