[PoC 142/241] global: Migrate CONFIG_PCIE_IMX_POWER_GPIO to CFG

Tom Rini
2022-11-20T14:13:59Z

drivers/pci/pcie_imx.c | 10 +++++-----
include/configs/mx6sabresd.h | 2 +-
include/configs/mx6sxsabresd.h | 2 +-
include/configs/novena.h | 2 +-
scripts/config_whitelist.txt | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 902507aaae38..da48466480cb 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -534,13 +534,13 @@ static int imx6_pcie_init_phy(void)

int imx6_pcie_toggle_power(struct udevice *vpcie)
{
-#ifdef CONFIG_PCIE_IMX_POWER_GPIO
- gpio_request(CONFIG_PCIE_IMX_POWER_GPIO, "pcie_power");
- gpio_direction_output(CONFIG_PCIE_IMX_POWER_GPIO, 0);
+#ifdef CFG_PCIE_IMX_POWER_GPIO
+ gpio_request(CFG_PCIE_IMX_POWER_GPIO, "pcie_power");
+ gpio_direction_output(CFG_PCIE_IMX_POWER_GPIO, 0);
mdelay(20);
- gpio_set_value(CONFIG_PCIE_IMX_POWER_GPIO, 1);
+ gpio_set_value(CFG_PCIE_IMX_POWER_GPIO, 1);
mdelay(20);
- gpio_free(CONFIG_PCIE_IMX_POWER_GPIO);
+ gpio_free(CFG_PCIE_IMX_POWER_GPIO);
#endif

#if CONFIG_IS_ENABLED(DM_REGULATOR)
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 116a9c6abcf3..1aa8a56cceb6 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -21,7 +21,7 @@

#ifdef CONFIG_CMD_PCI
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
-#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19)
+#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19)
#endif

/* PMIC */
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 85e5cfbb58db..fe0ad34ef9c1 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -124,7 +124,7 @@

#ifdef CONFIG_CMD_PCI
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0)
-#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)
+#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)
#endif

#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 1c695159dd8b..aecc75c050d8 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -46,7 +46,7 @@
/* PCI express */
#ifdef CONFIG_CMD_PCI
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29)
-#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12)
#endif

/* PMIC */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 392756572f81..adf41306e819 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -151,7 +151,7 @@ CFG_ODROID_REV_AIN
CFG_OTHBOOTARGS
CFG_OVERWRITE_ETHADDR_ONCE
CFG_PCIE_IMX_PERST_GPIO
-CONFIG_PCIE_IMX_POWER_GPIO
+CFG_PCIE_IMX_POWER_GPIO
CONFIG_PEN_ADDR_BIG_ENDIAN
CONFIG_PHY_BASE_ADR
CONFIG_PHY_ET1011C_TX_CLK_FIX
--
2.25.1