Merge tag 'efi-2020-04-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index cbed8d42b771946522cce0c17bec3a43dc4337fe..9c3a4428e11fb68c6a9520eb8ded5d8dea4a81f3 100644 (file)
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -28,7 +28,7 @@ struct sunxi_gpio_platdata {
        int gpio_count;
 };
 
-#ifndef CONFIG_DM_GPIO
+#if !CONFIG_IS_ENABLED(DM_GPIO)
 static int sunxi_gpio_output(u32 pin, u32 val)
 {
        u32 dat;
@@ -116,7 +116,7 @@ int sunxi_name_to_gpio(const char *name)
                return -1;
        return group * 32 + pin;
 }
-#endif
+#endif /* DM_GPIO */
 
 int sunxi_name_to_gpio_bank(const char *name)
 {
@@ -132,7 +132,7 @@ int sunxi_name_to_gpio_bank(const char *name)
        return -1;
 }
 
-#ifdef CONFIG_DM_GPIO
+#if CONFIG_IS_ENABLED(DM_GPIO)
 /* TODO(sjg@chromium.org): Remove this function and use device tree */
 int sunxi_name_to_gpio(const char *name)
 {
@@ -354,12 +354,14 @@ static const struct udevice_id sunxi_gpio_ids[] = {
        ID("allwinner,sun8i-v3s-pinctrl",       a_all),
        ID("allwinner,sun9i-a80-pinctrl",       a_all),
        ID("allwinner,sun50i-a64-pinctrl",      a_all),
+       ID("allwinner,sun50i-h6-pinctrl",       a_all),
        ID("allwinner,sun6i-a31-r-pinctrl",     l_2),
        ID("allwinner,sun8i-a23-r-pinctrl",     l_1),
        ID("allwinner,sun8i-a83t-r-pinctrl",    l_1),
        ID("allwinner,sun8i-h3-r-pinctrl",      l_1),
        ID("allwinner,sun9i-a80-r-pinctrl",     l_3),
        ID("allwinner,sun50i-a64-r-pinctrl",    l_1),
+       ID("allwinner,sun50i-h6-r-pinctrl",     l_2),
        { }
 };
 
@@ -371,4 +373,4 @@ U_BOOT_DRIVER(gpio_sunxi) = {
        .bind   = gpio_sunxi_bind,
        .probe  = gpio_sunxi_probe,
 };
-#endif
+#endif /* DM_GPIO */