From patchwork Sun Nov 20 14:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706866 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=qudzZO4U; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFXf93ZHFz23mR for ; Mon, 21 Nov 2022 01:17:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0137885435; Sun, 20 Nov 2022 15:10:12 +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="qudzZO4U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B60A852BA; Sun, 20 Nov 2022 15:09:28 +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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 477A78530D for ; Sun, 20 Nov 2022 15:09:17 +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-qv1-xf33.google.com with SMTP id d13so787714qvj.8 for ; Sun, 20 Nov 2022 06:09:17 -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=AWKlFmQ4IPbvyyNd6L0eMJX0Ak+MgYlVzQ6JvQ+VC6o=; b=qudzZO4UpRdmSXrdcx010QSk9wygv4cpHRuMYoP4YsjtX+BOH/cXc3S/P92Op/9/80 aHIOR8THIrgNVwwy0CCqJ1xdHB6BOf5hppBImboie8sj4veeuV/2GCW7UXuY2WsTNPbi W+puE/oj92ju6V17pgRl8x55z2sLpS6uUJwbM= 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=AWKlFmQ4IPbvyyNd6L0eMJX0Ak+MgYlVzQ6JvQ+VC6o=; b=0P/mn48tVVXkXaqfM18jqHQg/yYzoOzd3Hw23Q+JzwTSIDCyrDXT4vxSDAGcUmWEJH cXGWCHa7jrC9fZtFNNVEQ1dm5PHEACKUxNul1BhkMgCNYWzQiNBFHtPA/1NxHtqu99vi npy5tdJhpcF+5bfGD2Yq/E8eoA11pN9Flb/khPaLJQ/he+CcgDN0/Rc/n1Ckzklh0GQD YVXX5d4NXjz8iGAH1Gw36uQXWMJe1UiHoeyUQw0noZk2jJ7Z3zae+YAC/ctAEUIcXt/3 +RIXw0UMbjRVSvTBI+thfBe0d8GCNHhFtK0FQa6NyXGGvrlQFVzbSy0CYf2PBZ2Ri5h/ 1Fmg== X-Gm-Message-State: ANoB5pmIUdvRsc9Gw0ZpbGd8zIxDM7FpZW2GBtCtHH9ybJ3C0bSoNEBV shfD4ZRM8dsxFw7Gx0wrgWO2mRf/ZuwIew== X-Google-Smtp-Source: AA0mqf45KFIEBd/PrxMqeelHT3bNbkRAS7VXeDJ8yj2erYRijtWeIGwLLEQjaaJjX2xSe6C2EQVFsg== X-Received: by 2002:ad4:4f51:0:b0:4b9:1466:ceb6 with SMTP id eu17-20020ad44f51000000b004b91466ceb6mr742227qvb.71.1668953329369; Sun, 20 Nov 2022 06:08:49 -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 bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.08.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:48 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 141/241] global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG Date: Sun, 20 Nov 2022 09:07:31 -0500 Message-Id: <20221120140829.3057894-32-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-1-trini@konsulko.com> MIME-Version: 1.0 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/pci/pcie_imx.c | 12 ++++++------ include/configs/mx6sabresd.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/novena.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/vining_2000.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 46ac01713ff7..902507aaae38 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high) * do self-initialisation. * * In case your #PERST pin is connected to a plain GPIO pin of the - * CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's + * CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's * configuration file and the condition below will handle the rest * of the reset toggling. * @@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high) * Linux at all in the first place since it's in some non-reset * state due to being previously used in U-Boot. */ -#ifdef CONFIG_PCIE_IMX_PERST_GPIO - gpio_request(CONFIG_PCIE_IMX_PERST_GPIO, "pcie_reset"); - gpio_direction_output(CONFIG_PCIE_IMX_PERST_GPIO, 0); +#ifdef CFG_PCIE_IMX_PERST_GPIO + gpio_request(CFG_PCIE_IMX_PERST_GPIO, "pcie_reset"); + gpio_direction_output(CFG_PCIE_IMX_PERST_GPIO, 0); mdelay(20); - gpio_set_value(CONFIG_PCIE_IMX_PERST_GPIO, 1); + gpio_set_value(CFG_PCIE_IMX_PERST_GPIO, 1); mdelay(20); - gpio_free(CONFIG_PCIE_IMX_PERST_GPIO); + gpio_free(CFG_PCIE_IMX_PERST_GPIO); #else if (dm_gpio_is_valid(gpio)) { /* Assert PERST# for 20ms then de-assert */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 2b028e3aa2b1..116a9c6abcf3 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_USDHC_NUM 3 #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19) #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8b02c3b63101..85e5cfbb58db 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -123,7 +123,7 @@ #endif #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) #endif diff --git a/include/configs/novena.h b/include/configs/novena.h index 5176c6d1c48c..1c695159dd8b 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -45,7 +45,7 @@ /* PCI express */ #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12) #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 1e22ecfdc556..7debc90205a8 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -22,7 +22,7 @@ /* PCI */ #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) #endif /* USB */ diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 6db68c1e7001..7bfc22c043fe 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -40,7 +40,7 @@ #define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) #endif #define CFG_IMX6_PWM_PER_CLK 66000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb85e39ad2cd..392756572f81 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -150,7 +150,7 @@ CFG_NUM_DSP_CPUS CFG_ODROID_REV_AIN CFG_OTHBOOTARGS CFG_OVERWRITE_ETHADDR_ONCE -CONFIG_PCIE_IMX_PERST_GPIO +CFG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO CONFIG_PEN_ADDR_BIG_ENDIAN CONFIG_PHY_BASE_ADR