mmc: ca_dw_mmc: Misc cleanup of driver

[oweals/u-boot.git] / drivers / gpio / mxc_gpio.c

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 64ab7a303f111f38d6998cd96a4d4dc655af0665..c924e52f0713109f069875a4033d2c9a5daff242 100644 (file)
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -30,7 +30,7 @@ struct mxc_bank_info {
        struct gpio_regs *regs;
 };
 
-#ifndef CONFIG_DM_GPIO
+#if !CONFIG_IS_ENABLED(DM_GPIO)
 #define GPIO_TO_PORT(n)                ((n) / 32)
 
 /* GPIO port description */
@@ -41,14 +41,15 @@ static unsigned long gpio_ports[] = {
 #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
                defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
                defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \
-               defined(CONFIG_ARCH_IMX8)
+               defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050)
        [3] = GPIO4_BASE_ADDR,
 #endif
 #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
                defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \
-               defined(CONFIG_ARCH_IMX8)
+               defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050)
        [4] = GPIO5_BASE_ADDR,
-#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) || defined(CONFIG_IMX8M))
+#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) || \
+               defined(CONFIG_IMX8M) || defined(CONFIG_IMXRT1050))
        [5] = GPIO6_BASE_ADDR,
 #endif
 #endif
@@ -161,7 +162,7 @@ int gpio_direction_output(unsigned gpio, int value)
 }
 #endif
 
-#ifdef CONFIG_DM_GPIO
+#if CONFIG_IS_ENABLED(DM_GPIO)
 #include <fdtdec.h>
 static int mxc_gpio_is_output(struct gpio_regs *regs, int offset)
 {