spi: fsl_qspi: Pet watchdog even more

[u-boot] / drivers / gpio / rk_gpio.c

diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index fbdf9f3fd9b1c8c1026ac4d24023ef356fe57e2d..6f7366acbad4d02f60919c5f08cf9a693b5e1a10 100644 (file)
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -9,10 +9,13 @@
 
 #include <common.h>
 #include <dm.h>
-#include <asm/errno.h>
+#include <syscon.h>
+#include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <asm/arch/clock.h>
+#include <dm/pinctrl.h>
+#include <dt-bindings/clock/rk3288-cru.h>
 
 enum {
        ROCKCHIP_GPIOS_PER_BANK         = 32,
@@ -22,6 +25,8 @@ enum {
 
 struct rockchip_gpio_priv {
        struct rockchip_gpio_regs *regs;
+       struct udevice *pinctrl;
+       int bank;
        char name[2];
 };
 
@@ -53,7 +58,7 @@ static int rockchip_gpio_get_value(struct udevice *dev, unsigned offset)
        struct rockchip_gpio_priv *priv = dev_get_priv(dev);
        struct rockchip_gpio_regs *regs = priv->regs;
 
-       return readl(&regs->ext_port) & OFFSET_TO_BIT(offset);
+       return readl(&regs->ext_port) & OFFSET_TO_BIT(offset) ? 1 : 0;
 }
 
 static int rockchip_gpio_set_value(struct udevice *dev, unsigned offset,
@@ -70,16 +75,25 @@ static int rockchip_gpio_set_value(struct udevice *dev, unsigned offset,
 
 static int rockchip_gpio_get_function(struct udevice *dev, unsigned offset)
 {
-       return -ENOSYS;
-}
+#ifdef CONFIG_SPL_BUILD
+       return -ENODATA;
+#else
+       struct rockchip_gpio_priv *priv = dev_get_priv(dev);
+       struct rockchip_gpio_regs *regs = priv->regs;
+       bool is_output;
+       int ret;
 
-static int rockchip_gpio_xlate(struct udevice *dev, struct gpio_desc *desc,
-                           struct fdtdec_phandle_args *args)
-{
-       desc->offset = args->args[0];
-       desc->flags = args->args[1] & GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0;
+       ret = pinctrl_get_gpio_mux(priv->pinctrl, priv->bank, offset);
+       if (ret)
+               return ret;
 
-       return 0;
+       /* If it's not 0, then it is not a GPIO */
+       if (ret)
+               return GPIOF_FUNC;
+       is_output = readl(&regs->swport_ddr) & OFFSET_TO_BIT(offset);
+
+       return is_output ? GPIOF_OUTPUT : GPIOF_INPUT;
+#endif
 }
 
 static int rockchip_gpio_probe(struct udevice *dev)
@@ -87,13 +101,18 @@ static int rockchip_gpio_probe(struct udevice *dev)
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
        struct rockchip_gpio_priv *priv = dev_get_priv(dev);
        char *end;
-       int bank;
+       int ret;
+
+       /* This only supports RK3288 at present */
+       priv->regs = (struct rockchip_gpio_regs *)devfdt_get_addr(dev);
+       ret = uclass_first_device_err(UCLASS_PINCTRL, &priv->pinctrl);
+       if (ret)
+               return ret;
 
-       priv->regs = (struct rockchip_gpio_regs *)dev_get_addr(dev);
        uc_priv->gpio_count = ROCKCHIP_GPIOS_PER_BANK;
        end = strrchr(dev->name, '@');
-       bank = trailing_strtoln(dev->name, end);
-       priv->name[0] = 'A' + bank;
+       priv->bank = trailing_strtoln(dev->name, end);
+       priv->name[0] = 'A' + priv->bank;
        uc_priv->bank_name = priv->name;
 
        return 0;
@@ -105,7 +124,6 @@ static const struct dm_gpio_ops gpio_rockchip_ops = {
        .get_value              = rockchip_gpio_get_value,
        .set_value              = rockchip_gpio_set_value,
        .get_function           = rockchip_gpio_get_function,
-       .xlate                  = rockchip_gpio_xlate,
 };
 
 static const struct udevice_id rockchip_gpio_ids[] = {