spi: fsl_qspi: Pet watchdog even more

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

diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index afb27a396ff04fa4dc96d6d907d00fd3e0b0f2d3..c11e95355bc3cff27c9e595d9cce5242979155be 100644 (file)
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -6,11 +6,11 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/gpio.h>
 
 #define UNIPHIER_GPIO_PORTS_PER_BANK   8
@@ -95,7 +95,7 @@ static int uniphier_gpio_probe(struct udevice *dev)
        fdt_addr_t addr;
        unsigned int tmp;
 
-       addr = dev_get_addr(dev);
+       addr = devfdt_get_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;