From mboxrd@z Thu Jan 1 00:00:00 1970 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 E0F6EC433FE for ; Sun, 20 Nov 2022 13:42:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8415085329; Sun, 20 Nov 2022 14:35:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="bwsUVC2Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D74685299; Sun, 20 Nov 2022 14:34:34 +0100 (CET) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 8B59C8528F for ; Sun, 20 Nov 2022 14:34:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x736.google.com with SMTP id k4so6489917qkj.8 for ; Sun, 20 Nov 2022 05:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MEw6pRyYnWrkeJs13Y6QB9QctUj3TltMKev7Mn4dWQE=; b=bwsUVC2Q5ZRbhdMfpsL0taBhZ/UMD+pdRJmwrohl4cST9q+PxpnL7PvZYsDOGkoDcS 169QvL0uf5xH+xGSgCPJnOsVFboAJuqaEY3hQcID8042uFj2+SO1LOIMhftsyh/iwthl irMe6BlTv1Gc0rHQwrTj0UuxYH3/8ZAzmlvdc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MEw6pRyYnWrkeJs13Y6QB9QctUj3TltMKev7Mn4dWQE=; b=J23NzvmNI1+cN6opJ5sXmc/brCPgwPRo2A7UAHOi0WNOSnsNNPsFVqWPXGWPBr34oW BaLypVEnoDlNcdT4Fv8Uiztm+x98WhcQU3+nhw+krlJCza5GcT3oK5QP1zRUubCZKw+9 WKXUX5Km0x4BEz9QN9hJ0kSW4dTZaveRLaM8yLwWQmlwb+JzyHh3HMDYmSFrOtDt1U5g sGMV7m4oZ/TJg4ooP3EjvIGeKF6YyLIemygZSJ+qjr1eGirQhOX3mtz07uJ6XR7CttPe n3G2kaEzYiz/FFVPGkcMjhSU9FIhd+G/oaQjP9UCoogUtwS2RLqmn93dq+nHeoBToX7k zz5A== X-Gm-Message-State: ANoB5pkepdBzibLoOUrFpA9ZAUCNl6PzOv5biY6aS72SyE98w9ppYADw 39PqjozuE7Nml7vRwmSWDLn3JGBhUAfsfg== X-Google-Smtp-Source: AA0mqf6fIo0mBNl5eLuppn9v/iQVKWh9SJFFya+YtHWtZkStzc8VuBeBen4/gCvP3zWe9GmVgWxNdQ== X-Received: by 2002:a05:620a:13b4:b0:6fa:b1e9:6f2d with SMTP id m20-20020a05620a13b400b006fab1e96f2dmr12926170qki.560.1668951269164; Sun, 20 Nov 2022 05:34:29 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 048/241] global: Migrate CONFIG_GMII to CFG Date: Sun, 20 Nov 2022 08:30:39 -0500 Message-Id: <20221120133352.3055600-49-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-1-trini@konsulko.com> 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/net/mvneta.c | 6 +++--- drivers/net/mvpp2.c | 12 ++++++------ include/configs/MPC837XERDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d458..7bf744b483a7 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -192,7 +192,7 @@ DECLARE_GLOBAL_DATA_PTR; #define MVNETA_GMAC_FORCE_LINK_PASS BIT(1) #define MVNETA_GMAC_IB_BYPASS_AN_EN BIT(3) #define MVNETA_GMAC_CONFIG_MII_SPEED BIT(5) -#define MVNETA_GMAC_CONFIG_GMII_SPEED BIT(6) +#define MVNETA_GMAC_CFG_GMII_SPEED BIT(6) #define MVNETA_GMAC_AN_SPEED_EN BIT(7) #define MVNETA_GMAC_SET_FC_EN BIT(8) #define MVNETA_GMAC_ADVERT_FC_EN BIT(9) @@ -1163,7 +1163,7 @@ static void mvneta_adjust_link(struct udevice *dev) val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG); val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED | - MVNETA_GMAC_CONFIG_GMII_SPEED | + MVNETA_GMAC_CFG_GMII_SPEED | MVNETA_GMAC_CONFIG_FULL_DUPLEX | MVNETA_GMAC_AN_SPEED_EN | MVNETA_GMAC_AN_DUPLEX_EN); @@ -1187,7 +1187,7 @@ static void mvneta_adjust_link(struct udevice *dev) val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX; if (phydev->speed == SPEED_1000) - val |= MVNETA_GMAC_CONFIG_GMII_SPEED; + val |= MVNETA_GMAC_CFG_GMII_SPEED; else if (pp->speed == SPEED_100) val |= MVNETA_GMAC_CONFIG_MII_SPEED; diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 8c9afdf79aba..d9bdf2adad11 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -379,7 +379,7 @@ do { \ #define MVPP2_GMAC_EN_PCS_AN BIT(2) #define MVPP2_GMAC_AN_BYPASS_EN BIT(3) #define MVPP2_GMAC_CONFIG_MII_SPEED BIT(5) -#define MVPP2_GMAC_CONFIG_GMII_SPEED BIT(6) +#define MVPP2_GMAC_CFG_GMII_SPEED BIT(6) #define MVPP2_GMAC_AN_SPEED_EN BIT(7) #define MVPP2_GMAC_FC_ADV_EN BIT(9) #define MVPP2_GMAC_EN_FC_AN BIT(11) @@ -3064,7 +3064,7 @@ static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port) val = MVPP2_GMAC_EN_PCS_AN | MVPP2_GMAC_AN_BYPASS_EN | MVPP2_GMAC_CONFIG_MII_SPEED | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_FC_ADV_EN | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; @@ -3147,7 +3147,7 @@ static void gop_gmac_2500basex_cfg(struct mvpp2_port *port) */ val = MVPP2_GMAC_AN_BYPASS_EN | MVPP2_GMAC_EN_PCS_AN | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG); @@ -3188,7 +3188,7 @@ static void gop_gmac_1000basex_cfg(struct mvpp2_port *port) */ val = MVPP2_GMAC_AN_BYPASS_EN | MVPP2_GMAC_EN_PCS_AN | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG); @@ -4441,7 +4441,7 @@ static void mvpp2_link_event(struct mvpp2_port *port) val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG); val &= ~(MVPP2_GMAC_CONFIG_MII_SPEED | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_AN_SPEED_EN | MVPP2_GMAC_AN_DUPLEX_EN); @@ -4451,7 +4451,7 @@ static void mvpp2_link_event(struct mvpp2_port *port) if (phydev->speed == SPEED_1000 || phydev->speed == 2500) - val |= MVPP2_GMAC_CONFIG_GMII_SPEED; + val |= MVPP2_GMAC_CFG_GMII_SPEED; else if (phydev->speed == SPEED_100) val |= MVPP2_GMAC_CONFIG_MII_SPEED; diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2e1264978908..dc7fe06ceb4b 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -183,7 +183,7 @@ */ #ifdef CONFIG_TSEC_ENET -#define CONFIG_GMII /* MII PHY management */ +#define CFG_GMII /* MII PHY management */ #define CONFIG_TSEC1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e634d868a090..8203c5ccee12 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -48,7 +48,7 @@ CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 CFG_FSL_SERDES2 CFG_GATEWAYIP -CONFIG_GMII +CFG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM -- 2.25.1