colibri_imx6: fix video stdout in default environment

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

diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 94abbeb39adc276d066b5450b33d99c965bdfc86..9c3a4428e11fb68c6a9520eb8ded5d8dea4a81f3 100644 (file)
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
  *
@@ -6,8 +7,6 @@
  * (C) Copyright 2007-2011
  * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
  * Tom Cubie <tangliang@allwinnertech.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -19,8 +18,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <dt-bindings/gpio/gpio.h>
 
 #define SUNXI_GPIOS_PER_BANK   SUNXI_GPIO_A_NR
 
@@ -30,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;
@@ -118,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)
 {
@@ -134,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)
 {
@@ -215,12 +213,27 @@ static int sunxi_gpio_get_function(struct udevice *dev, unsigned offset)
                return GPIOF_FUNC;
 }
 
+static int sunxi_gpio_xlate(struct udevice *dev, struct gpio_desc *desc,
+                           struct ofnode_phandle_args *args)
+{
+       int ret;
+
+       ret = device_get_child(dev, args->args[0], &desc->dev);
+       if (ret)
+               return ret;
+       desc->offset = args->args[1];
+       desc->flags = args->args[2] & GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0;
+
+       return 0;
+}
+
 static const struct dm_gpio_ops gpio_sunxi_ops = {
        .direction_input        = sunxi_gpio_direction_input,
        .direction_output       = sunxi_gpio_direction_output,
        .get_value              = sunxi_gpio_get_value,
        .set_value              = sunxi_gpio_set_value,
        .get_function           = sunxi_gpio_get_function,
+       .xlate                  = sunxi_gpio_xlate,
 };
 
 /**
@@ -280,7 +293,7 @@ static int gpio_sunxi_bind(struct udevice *parent)
        if (plat)
                return 0;
 
-       ctlr = (struct sunxi_gpio_reg *)dev_get_addr(parent);
+       ctlr = (struct sunxi_gpio_reg *)devfdt_get_addr(parent);
        for (bank = 0; bank < soc_data->no_banks; bank++) {
                struct sunxi_gpio_platdata *plat;
                struct udevice *dev;
@@ -296,7 +309,7 @@ static int gpio_sunxi_bind(struct udevice *parent)
                                        plat->bank_name, plat, -1, &dev);
                if (ret)
                        return ret;
-               dev->of_offset = parent->of_offset;
+               dev_set_of_offset(dev, dev_of_offset(parent));
        }
 
        return 0;
@@ -329,6 +342,7 @@ static const struct udevice_id sunxi_gpio_ids[] = {
        ID("allwinner,sun4i-a10-pinctrl",       a_all),
        ID("allwinner,sun5i-a10s-pinctrl",      a_all),
        ID("allwinner,sun5i-a13-pinctrl",       a_all),
+       ID("allwinner,sun50i-h5-pinctrl",       a_all),
        ID("allwinner,sun6i-a31-pinctrl",       a_all),
        ID("allwinner,sun6i-a31s-pinctrl",      a_all),
        ID("allwinner,sun7i-a20-pinctrl",       a_all),
@@ -336,12 +350,18 @@ static const struct udevice_id sunxi_gpio_ids[] = {
        ID("allwinner,sun8i-a33-pinctrl",       a_all),
        ID("allwinner,sun8i-a83t-pinctrl",      a_all),
        ID("allwinner,sun8i-h3-pinctrl",        a_all),
+       ID("allwinner,sun8i-r40-pinctrl",       a_all),
+       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),
        { }
 };
 
@@ -353,4 +373,4 @@ U_BOOT_DRIVER(gpio_sunxi) = {
        .bind   = gpio_sunxi_bind,
        .probe  = gpio_sunxi_probe,
 };
-#endif
+#endif /* DM_GPIO */